slococo
/
fids
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bugs

This commit is contained in:
Santiago Lo Coco 2023-10-23 16:15:50 -03:00
parent 7a8861df16
commit b379dbdf19
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitlab-ci.yml
View File

@ -245,6 +245,11 @@ deliver-dockerhub:
- docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
- docker login -u $DOCKER_HUB_USER --password $DOCKER_HUB_PASS - 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 $FLIGHTS_INFO_PROD_IMAGE_NAME $DOCKER_HUB_FLIGHT_INFO_IMAGE
- docker tag $USER_MANAGER_PROD_IMAGE_NAME $DOCKER_HUB_USER_MANAGER_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 - 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 - 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 - 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 - docker compose -f screen-domain/docker-compose.yml up -d
- export CLIENT_IMAGE=$DOCKER_HUB_BROWSER_CLIENT_IMAGE - 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 - docker compose -f browser-domain/docker-compose.yml up -d
needs: needs:
- job: deliver-dockerhub - job: deliver-dockerhub

2
browser-domain/nginx/default.conf
View File

@ -1,5 +1,5 @@
server { server {
listen 80; listen 8080;
location / { location / {
root /usr/share/nginx/html; root /usr/share/nginx/html;
index unresolvable-file-html.html; index unresolvable-file-html.html;

2
screen-domain/nginx/default.conf
View File

@ -1,5 +1,5 @@
server { server {
listen 81; listen 8081;
location / { location / {
root /usr/share/nginx/html; root /usr/share/nginx/html;
index unresolvable-file-html.html; index unresolvable-file-html.html;