From 1d5f9060957c3d208a9696d5df4d3970e4aea4d5 Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Fri, 22 Mar 2019 15:59:31 +0100
Subject: [PATCH] Modify buid-arg variable name

---
 .gitlab-ci.yml | 4 ++--
 Dockerfile     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 804ffb26..0c1a0401 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ build_development:
   script:
     - export TAG=dev
     - export NGINX_PORT=8081
-    - docker-compose build --build-arg build-conf=dev nginx-app 
+    - docker-compose build --build-arg conf=dev nginx-app 
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker-compose push
 
@@ -33,7 +33,7 @@ build_release:
   script:
     - export TAG=$(echo $CI_COMMIT_TAG | sed 's/v//g')
     - export NGINX_PORT=8081
-    - docker-compose build --build-arg build-conf=prod nginx-app
+    - docker-compose build --build-arg conf=prod nginx-app
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker-compose push
 
diff --git a/Dockerfile b/Dockerfile
index eca92cca..0debac44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,10 +12,10 @@ COPY . /app
 # Launch postinstall script (to include crypto module)
 RUN npm run postinstall
 
-ARG build-conf
+ARG conf
 
 # Building the Angular app /dist i18n
-RUN npm run build-i18n:${build-conf}
+RUN npm run build-i18n:${conf}
 
 # Stage 1, based on Nginx, to have only the compiled app
 FROM nginx
-- 
GitLab