diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 804ffb269d004a1688e6fbd5605ce63d6c8ab848..0c1a0401995e26f73c5c82535066f131f90f7b37 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 eca92cca9713455b5effc1d1cc02420637ba0c7e..0debac449e764f81f917331cc26962d92a192267 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