fix environment valorisation in docker-compose file

docker-compose-staging.yml

@@ -28,17 +28,18 @@ services:
       - [email protected]
       - localeat_smtp_password=localeat
 
+
   ui:
     build:
       context: "."
       dockerfile: ./ui/Dockerfile
+      args:
+        - localeat_environment_type=staging
     image: benjaminpochat/localeat-ui-staging:${DOCKER_IMAGE_TAG:-latest}
     networks:
       - hostnet
     depends_on:
       - core
-    environment:
-      - localeat_environment_type=staging
 
 networks:
   hostnet:

docker-compose.yml

@@ -16,17 +16,17 @@ services:
     build:
       context: "."
       dockerfile: ./core/Dockerfile
-      args:
-        - localeat_datasource_url=jdbc:postgresql://localhost:5432/localeat
-        - localeat_datasource_username=localeat
-        - localeat_datasource_password=localeat
-        - [email protected]
-        - localeat_smtp_password=localeat
     image: benjaminpochat/localeat-core:${DOCKER_IMAGE_TAG:-latest}
     networks:
       - hostnet
     depends_on:
       - database
+    environment:
+      - localeat_datasource_url=jdbc:postgresql://localhost:5432/localeat
+      - localeat_datasource_username=localeat
+      - localeat_datasource_password=localeat
+      - [email protected]
+      - localeat_smtp_password=localeat
 
   ui:
     build:

ui/Dockerfile

@@ -1,5 +1,8 @@
 # STEP 1 build static website
 FROM node:14.4-alpine as node
+
+ARG localeat_environment_type
+
 RUN apk update
 WORKDIR /app
 COPY ./ui .