From b379dbdf191208bb99e9c07099db8326afbf8dda Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Mon, 23 Oct 2023 16:15:50 -0300 Subject: [PATCH] Fix bugs --- .gitlab-ci.yml | 11 +++++++++++ browser-domain/nginx/default.conf | 2 +- screen-domain/nginx/default.conf | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6eac134..8956205 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -245,6 +245,11 @@ deliver-dockerhub: - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY - docker login -u $DOCKER_HUB_USER --password $DOCKER_HUB_PASS + - export API_IMAGE=$FLIGHTS_INFO_TEST_IMAGE_NAME + - docker compose -f flights-domain/docker-compose.yml --env-file $ENV_DEV_FILE down + - export API_IMAGE=$USER_MANAGER_TEST_IMAGE_NAME + - ocker compose -f auth-domain/docker-compose.yml --env-file $ENV_DEV_FILE down + - docker tag $FLIGHTS_INFO_PROD_IMAGE_NAME $DOCKER_HUB_FLIGHT_INFO_IMAGE - docker tag $USER_MANAGER_PROD_IMAGE_NAME $DOCKER_HUB_USER_MANAGER_IMAGE - docker tag $BROWSER_CLIENT_PROD_IMAGE_NAME $DOCKER_HUB_BROWSER_CLIENT_IMAGE @@ -288,8 +293,14 @@ deploy-prod: - docker compose -f auth-domain/docker-compose.yml --env-file $ENV_PROD_FILE exec usermanager-api python manage.py seed_db - export CLIENT_IMAGE=$DOCKER_HUB_SCREEN_CLIENT_IMAGE + - docker compose -f screen-domain/docker-compose.yml stop + - docker compose -f screen-domain/docker-compose.yml rm -f + - docker compose -f screen-domain/docker-compose.yml pull - docker compose -f screen-domain/docker-compose.yml up -d - export CLIENT_IMAGE=$DOCKER_HUB_BROWSER_CLIENT_IMAGE + - docker compose -f browser-domain/docker-compose.yml stop + - docker compose -f browser-domain/docker-compose.yml rm -f + - docker compose -f browser-domain/docker-compose.yml pull - docker compose -f browser-domain/docker-compose.yml up -d needs: - job: deliver-dockerhub diff --git a/browser-domain/nginx/default.conf b/browser-domain/nginx/default.conf index 702aebb..485b758 100644 --- a/browser-domain/nginx/default.conf +++ b/browser-domain/nginx/default.conf @@ -1,5 +1,5 @@ server { - listen 80; + listen 8080; location / { root /usr/share/nginx/html; index unresolvable-file-html.html; diff --git a/screen-domain/nginx/default.conf b/screen-domain/nginx/default.conf index 68b03e3..2d8c03f 100644 --- a/screen-domain/nginx/default.conf +++ b/screen-domain/nginx/default.conf @@ -1,5 +1,5 @@ server { - listen 81; + listen 8081; location / { root /usr/share/nginx/html; index unresolvable-file-html.html;