second commmit

API_PROD/Dockerfile

@@ -11,6 +11,14 @@ RUN apt update; \
     chmod +x /bin/entrypoint.sh
 
 
+
+ENV VAPOR_DBNAME=db_vapormap
+ENV VAPOR_DBUSER=user_vapormap
+ENV VAPOR_DBPASS=vapormap
+ENV VAPOR_DBHOST=db
+ENV PYTHONPATH=/API_PROD/app
+ENV SETTINGS_FILE=production
+
 EXPOSE 5000
 
 WORKDIR /API_PROD/app/api
@@ -20,4 +28,3 @@ CMD ["gunicorn", "--bind","0.0.0.0:5000", "wsgi:app"]
 
 
 
-

FRONTEND_PROD/Dockerfile

@@ -7,6 +7,13 @@ RUN apt update \
    && apt -y install gettext-base
 
 
+ENV VAPORMAP_BACKEND=localhost
+ENV VAPORMAP_BACKEND_PORT=5000
+ENV VAPORMAP_URL_SERVERNAME=0.0.0.0
+ENV VAPORMAP_URL_PORT=8000
+ENV VAPORMAP_FRONTEND_ROOT=/FRONTEND_prod/frontend
+
+
 EXPOSE 80
 
 RUN envsubst '${VAPORMAP_BACKEND},${VAPORMAP_BACKEND_PORT}' < config.json.template > config.json

docker-compose.yaml

@@ -2,7 +2,7 @@ version: "3.8"
 services:
 
   db:
-    image: mariadb:10.3.31
+    image: gitlab-registry.imt-atlantique.fr/s22noufe/vapormap-ci/mariadb
     environment:
       - MARIADB_ROOT_PASSWORD=vapormap
       - MARIADB_ROOT_HOST=db
@@ -14,8 +14,7 @@ services:
       - "3306:3306"
 
   api:
-    build: ./API_PROD
-    image: api_prod
+    image: gitlab-registry.imt-atlantique.fr/s22noufe/vapormap-ci/api_prod
     environment:
       - VAPOR_DBNAME=db_vapormap
       - VAPOR_DBUSER=user_vapormap
@@ -29,8 +28,8 @@ services:
       - db
 
   front:
-    build: ./FRONTEND_PROD
-    image: frontend_prod
+
+    image: gitlab-registry.imt-atlantique.fr/s22noufe/vapormap-ci/front_prod
     environment:
       - VAPORMAP_BACKEND=localhost
       - VAPORMAP_BACKEND_PORT=5000
@@ -46,4 +45,3 @@ services:
 
 
 
-