diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24278d266e0a80035265ce96314667d071461013..01461a73aa7bccdf64c31331ef729fdff243f023 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 8d7e2feae7e7eb7c446e3374aef7316039a86c66..86cb7bff61c99dce84f39ef2d4853baf0b1f6467 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 a50d216033c3fa72deed355a399f11a8998eeeed..139d67bfb5e56b1842301dbab6cdb61206e8de6b 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 3735ebbe8b8fbb278cec03fc2208829a8c377182..a2cc33267f5b3f1683776e0ca8bccec0ad18a159 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 80ba10eef0f8f06b7fe53c1f81936981213d7ca5..0fe8de6fe2774fa4cb160d5fbc7070bd601ef12f 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',