From ce7f72d4b963c2c74518d7f8f25415c214581f00 Mon Sep 17 00:00:00 2001 From: Ilyas Salikhov Date: Fri, 25 May 2018 18:17:31 +0300 Subject: [PATCH] Fix test running in Jenkins --- Jenkinsfile | 2 +- docker-compose-test.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d678bf9..ab87e76 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { stage('Prepare') { steps { sh 'cp config_test.yml.dist config_test.yml' - compose 'up -d --build postgres_test' + compose 'up -d --build postgres' compose 'run --rm mg_telegram make migrate_test' } } diff --git a/docker-compose-test.yml b/docker-compose-test.yml index c4f0e2e..6d4babf 100644 --- a/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -1,7 +1,7 @@ version: '2.1' services: - postgres_test: + postgres: image: postgres:9.6 environment: POSTGRES_USER: mg_telegram_test @@ -10,13 +10,13 @@ services: ports: - ${POSTGRES_ADDRESS:-127.0.0.1:5450}:${POSTGRES_PORT:-5450} - mg_telegram_test: + mg_telegram: image: golang:1.9.3-stretch working_dir: /mg_telegram user: ${UID:-1000}:${GID:-1000} volumes: - ./:/mg_telegram/ links: - - postgres_test + - postgres ports: - ${MG_TELEGRAM_ADDRESS:-3002}:3002