diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a922ead789f0b3272c36fe7c1d9ecf8a1ad5802..29929f4624b15c7138dcb2b548c7775c3790a2eb 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 7ffc80bdbb7fb5dbf7c148305dd48960018cbeb1..1ee257b2850fa504d09ba2bd1e520c12c8c98faf 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