From a3d006be939425727d4889bfb27e5ad66bdf7f37 Mon Sep 17 00:00:00 2001 From: FORESTIER Fabien <fabien.forestier@soprasteria.com> Date: Tue, 6 Nov 2018 10:29:57 +0100 Subject: [PATCH] Remove unused config variable, add NODE_ENV in gitlab-ci and change container name regarding the env --- .gitlab-ci.yml | 4 ++++ docker-compose.yml | 2 +- src/environments/environment.dev.ts | 1 - src/environments/environment.rec.ts | 1 - src/environments/environment.ts | 1 - 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24278d26..01461a73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,7 @@ build_development: - master - sandbox script: + - export NODE_ENV=DEV - export NGINX_PORT=8081 - docker-compose --project-name data-reloaded-dev build --build-arg env=dev nginx-app @@ -28,6 +29,7 @@ deploy_development: - master - sandbox script: + - export NODE_ENV=DEV - export NGINX_PORT=8081 - export MATOMO_SITE_ID=1 - export MATOMO_SERVER_URL=https://matomo-intothesky.alpha.grandlyon.com @@ -51,6 +53,7 @@ build_staging: only: - staging script: + - export NODE_ENV=REC - export NGINX_PORT=8080 - docker-compose --project-name data-reloaded-rec build --build-arg env=rec nginx-app @@ -59,6 +62,7 @@ deploy_staging: only: - staging script: + - export NODE_ENV=REC - export NGINX_PORT=8080 - export MATOMO_SITE_ID=3 - export MATOMO_SERVER_URL=https://matomo-intothesky.alpha.grandlyon.com diff --git a/docker-compose.yml b/docker-compose.yml index 8d7e2fea..86cb7bff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: nginx-app: - container_name: nginx-app + container_name: nginx-app-${NODE_ENV} restart: unless-stopped build: context: ./ diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index a50d2160..139d67bf 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -9,7 +9,6 @@ const kongBaseUrl = 'https://kong.alpha.grandlyon.com'; export const environment = { production: true, - kongUrl: kongBaseUrl, oidcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/oidc', glcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/glc', tokenEndpoint: kongBaseUrl + '/authentication/dev/token', diff --git a/src/environments/environment.rec.ts b/src/environments/environment.rec.ts index 3735ebbe..a2cc3326 100644 --- a/src/environments/environment.rec.ts +++ b/src/environments/environment.rec.ts @@ -9,7 +9,6 @@ const kongBaseUrl = 'https://kong.alpha.grandlyon.com'; export const environment = { production: true, - kongUrl: kongBaseUrl, oidcLoginEndpoint: kongBaseUrl + '/authentication/rec/login/oidc', glcLoginEndpoint: kongBaseUrl + '/authentication/rec/login/glc', tokenEndpoint: kongBaseUrl + '/authentication/rec/token', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 80ba10ee..0fe8de6f 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -9,7 +9,6 @@ const kongBaseUrl = 'https://kong.alpha.grandlyon.com'; export const environment = { production: false, - kongUrl: kongBaseUrl, oidcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/oidc', glcLoginEndpoint: kongBaseUrl + '/authentication/dev/login/glc', tokenEndpoint: kongBaseUrl + '/authentication/dev/token', -- GitLab