From 5388345b414d53fbddc675ecea41d9336fce3328 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Wed, 4 Oct 2023 20:45:52 -0300 Subject: [PATCH] Use CI/CD variables for .env files --- .gitlab-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1fcf213..192b60a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,8 +78,8 @@ test-api: - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY - - docker compose -f docker-compose.yml --env-file .env.dev --profile api pull - - docker compose -f docker-compose.yml --env-file .env.dev --profile api up --abort-on-container-exit + - docker compose -f docker-compose.yml --env-file $ENV_DEV --profile api pull + - docker compose -f docker-compose.yml --env-file $ENV_DEV --profile api up --abort-on-container-exit - docker cp foodtruckers_api:/usr/src/app/coverage.xml . - docker cp foodtruckers_api:/usr/src/app/report.xml . artifacts: @@ -105,8 +105,8 @@ test-integration: - export API_IMAGE=$API_TEST_IMAGE_NAME - export CLIENT_IMAGE=$CLIENT_TEST_IMAGE_NAME - export TEST_TARGET=INTEGRATION - - docker compose -f docker-compose.yml --env-file .env.dev --profile all pull - - docker compose -f docker-compose.yml --env-file .env.dev --profile all up --abort-on-container-exit + - docker compose -f docker-compose.yml --env-file $ENV_DEV --profile all pull + - docker compose -f docker-compose.yml --env-file $ENV_DEV --profile all up --abort-on-container-exit needs: - job: test-api - job: build-client @@ -145,11 +145,11 @@ deploy-prod: - docker login -u $DOCKER_HUB_USER --password $DOCKER_HUB_PASS - - docker compose -f docker-compose.yml --profile all --env-file .env.prod stop - - docker compose -f docker-compose.yml --profile all --env-file .env.prod rm - - docker compose -f docker-compose.yml --profile all --env-file .env.prod pull - - docker compose -f docker-compose.yml --profile all --env-file .env.prod up -d + - docker compose -f docker-compose.yml --profile all --env-file $ENV_PROD stop + - docker compose -f docker-compose.yml --profile all --env-file $ENV_PROD rm + - docker compose -f docker-compose.yml --profile all --env-file $ENV_PROD pull + - docker compose -f docker-compose.yml --profile all --env-file $ENV_PROD up -d needs: - job: deliver-dockerhub - job: preparation - artifacts: true \ No newline at end of file + artifacts: true