Skip to content
Snippets Groups Projects
Commit 1d5f9060 authored by FORESTIER Fabien's avatar FORESTIER Fabien
Browse files

Modify buid-arg variable name

parent 6226e93c
Branches
No related tags found
1 merge request!19Development
Pipeline #
...@@ -20,7 +20,7 @@ build_development: ...@@ -20,7 +20,7 @@ build_development:
script: script:
- export TAG=dev - export TAG=dev
- export NGINX_PORT=8081 - 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 login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker-compose push - docker-compose push
...@@ -33,7 +33,7 @@ build_release: ...@@ -33,7 +33,7 @@ build_release:
script: script:
- export TAG=$(echo $CI_COMMIT_TAG | sed 's/v//g') - export TAG=$(echo $CI_COMMIT_TAG | sed 's/v//g')
- export NGINX_PORT=8081 - 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 login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker-compose push - docker-compose push
......
...@@ -12,10 +12,10 @@ COPY . /app ...@@ -12,10 +12,10 @@ COPY . /app
# Launch postinstall script (to include crypto module) # Launch postinstall script (to include crypto module)
RUN npm run postinstall RUN npm run postinstall
ARG build-conf ARG conf
# Building the Angular app /dist i18n # 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 # Stage 1, based on Nginx, to have only the compiled app
FROM nginx FROM nginx
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment