From 9836271da7771be2dfe64472bfa86dbf2ac176f7 Mon Sep 17 00:00:00 2001
From: Antoine Gaudron-desjardins <antoine.gaudrondesjardins@student-cs.fr>
Date: Thu, 7 Jul 2022 09:40:03 +0200
Subject: [PATCH] fix port problem
---
.gitlab-ci.yml | 4 ++--
backend/docker-compose.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a922ea..29929f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,8 +149,8 @@ lint:
docker-compose up -d &&
exit" ; else
- cd ./frontend
- # - echo 'REACT_APP_BASE_URL_BACK="http://localhost:8000/api"' > .env;
- # - echo 'REACT_APP_BASE_URL_FRONT="http://eatfast.cs-campus.fr"' >> .env;
+ - echo 'REACT_APP_BASE_URL_BACK="http://eatfast.cs-campus.fr/api"' > .env;
+ - echo 'REACT_APP_BASE_URL_FRONT="http://eatfast.cs-campus.fr"' >> .env;
- npm install && npm run build
- scp -r build/ eatfast@"$DOMAIN":/var/www/eatfast-website/frontend ; fi
diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml
index 7ffc80b..1ee257b 100644
--- a/backend/docker-compose.yml
+++ b/backend/docker-compose.yml
@@ -25,7 +25,7 @@ services:
condition: service_healthy
restart: always
ports:
- - 80:80
+ - 8000:80
env_file: .env
environment:
DB_HOST: db
--
GitLab