From 3317b12268ae892d7984022d670e55f697d92781 Mon Sep 17 00:00:00 2001 From: Loup THERON Date: Thu, 25 Mar 2021 08:36:42 +0100 Subject: [PATCH 1/2] Update DockerfileBuildApp --- infra/docker/DockerfileBuildApp | 1 + 1 file changed, 1 insertion(+) diff --git a/infra/docker/DockerfileBuildApp b/infra/docker/DockerfileBuildApp index d183f0354e..283ef40486 100644 --- a/infra/docker/DockerfileBuildApp +++ b/infra/docker/DockerfileBuildApp @@ -1,3 +1,4 @@ + ##################### # Multi stage build # ##################### From 9f7826f9131588b1f91a840d8779303fc4b94c44 Mon Sep 17 00:00:00 2001 From: Loup Theron Date: Thu, 25 Mar 2021 08:55:14 +0100 Subject: [PATCH 2/2] inject env variable --- Makefile | 2 +- infra/docker/DockerfileBuildApp | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3364082eaf..bc627dc1a1 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ test-front: # CI commands - app docker-build: - docker build --no-cache -f infra/docker/DockerfileBuildApp . -t monitorfish-app:$(VERSION) --build-arg VERSION=$(VERSION) --build-arg GITHUB_SHA=$(GITHUB_SHA) + docker build --no-cache -f infra/docker/DockerfileBuildApp . -t monitorfish-app:$(VERSION) --build-arg VERSION=$(VERSION) --build-arg ENV_PROFILE=$(ENV_PROFILE) --build-arg GITHUB_SHA=$(GITHUB_SHA) docker-tag: docker tag monitorfish-app:$(VERSION) docker.pkg.github.com/mtes-mct/monitorfish/monitorfish-app:$(VERSION) docker-push: diff --git a/infra/docker/DockerfileBuildApp b/infra/docker/DockerfileBuildApp index 283ef40486..bf9a3ea2b1 100644 --- a/infra/docker/DockerfileBuildApp +++ b/infra/docker/DockerfileBuildApp @@ -31,7 +31,9 @@ RUN mvn clean package -DskipTests=true FROM ubuntu:18.04 as buildFront ENV DEBIAN_FRONTEND=noninteractive -ENV REACT_APP_ENV=dev + +ARG ENV_PROFILE +ENV REACT_APP_ENV $ENV_PROFILE RUN echo ${REACT_APP_ENV} @@ -63,8 +65,11 @@ FROM azul/zulu-openjdk-alpine:11 ARG VERSION ENV VERSION $VERSION -ENV ENV_PROFILE=dev -ENV REACT_APP_ENV=dev + +ARG ENV_PROFILE +ENV ENV_PROFILE $ENV_PROFILE + +ENV REACT_APP_ENV $ENV_PROFILE ENV ENV_DB_URL= # Add bash