From 4636b606a2cd0ddb73d45d38e46cd984e4a0845e Mon Sep 17 00:00:00 2001
From: Benjamin POCHAT <benjamin@MacBookPro.home>
Date: Mon, 22 Feb 2021 23:37:06 +0100
Subject: [PATCH] fix environment valorisation in docker-compose file

---
 docker-compose-staging.yml |  5 +++--
 docker-compose.yml         | 12 ++++++------
 ui/Dockerfile              |  3 +++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml
index b567a0b..8afa9a4 100644
--- a/docker-compose-staging.yml
+++ b/docker-compose-staging.yml
@@ -28,17 +28,18 @@ services:
       - localeat_smtp_username=la.viande.en.direct@gmail.com
       - 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:
diff --git a/docker-compose.yml b/docker-compose.yml
index 648fd0c..e181bbe 100644
--- a/docker-compose.yml
+++ b/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
-        - localeat_smtp_username=la.viande.en.direct@gmail.com
-        - 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
+      - localeat_smtp_username=la.viande.en.direct@gmail.com
+      - localeat_smtp_password=localeat
 
   ui:
     build:
diff --git a/ui/Dockerfile b/ui/Dockerfile
index 402793e..d49e4c6 100644
--- a/ui/Dockerfile
+++ b/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 .