Merge feature/discovery service standardization (#51)

DigitalState · Sep 2, 2018 · 6fbfcc3 · 6fbfcc3
1 parent 2de74b0
commit 6fbfcc3
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 15 deletions.
diff --git a/.env b/.env
@@ -1,5 +1,6 @@
 COMPOSE_PROJECT_NAME=dsservices
 NETWORK=dsproxy_default
+PROXY_HOST=127.0.0.1
 DIRECTORY=.
 IMAGE_TAG=0.9.1
 API_HOST=api.services.ds

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.10.0
+
+- Feature [Discovery] Standardize discovery service names
+- Upgrade [Core] Upgrade digitalstate/core dependency to 0.10.0
+
 ## 0.9.0
 
 - Upgrade [Core] Upgrade digitalstate/core dependency to 0.9.0

diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -5,21 +5,35 @@ services:
     image: 'digitalstate/services:${IMAGE_TAG}'
     environment:
       SYMFONY_ENV: dev
+    extra_hosts:
+      - 'api.assets.dev.ds:${PROXY_HOST}'
+      - 'api.authentication.dev.ds:${PROXY_HOST}'
+      - 'api.camunda.dev.ds:${PROXY_HOST}'
+      - 'api.cases.dev.ds:${PROXY_HOST}'
+      - 'api.cms.dev.ds:${PROXY_HOST}'
+      - 'api.discovery.dev.ds:${PROXY_HOST}'
+      - 'api.formio.dev.ds:${PROXY_HOST}'
+      - 'api.forms.dev.ds:${PROXY_HOST}'
+      - 'api.identities.dev.ds:${PROXY_HOST}'
+      - 'api.records.dev.ds:${PROXY_HOST}'
+      - 'api.services.dev.ds:${PROXY_HOST}'
+      - 'api.tasks.dev.ds:${PROXY_HOST}'
+      - 'api.tenants.dev.ds:${PROXY_HOST}'
 
   database_ui:
     image: adminer:4-standalone
     environment:
-      SERVICE_8080_ID: '${COMPOSE_PROJECT_NAME}_database_ui_8080'
-      SERVICE_8080_NAME: '${COMPOSE_PROJECT_NAME}_database_ui_8080'
+      SERVICE_8080_ID: '${COMPOSE_PROJECT_NAME}_database_ui_http'
+      SERVICE_8080_NAME: '${COMPOSE_PROJECT_NAME}_database_ui_http'
       SERVICE_8080_TAGS: 'proxy.enable=true,proxy.tags=external,proxy.frontend.entryPoints=http,proxy.frontend.rule=Host:${DATABASE_UI_HOST}'
     links:
       - database:services_database
 
   cache_ui:
     image: marian/rebrow
     environment:
-      SERVICE_5001_ID: '${COMPOSE_PROJECT_NAME}_cache_ui_5001'
-      SERVICE_5001_NAME: '${COMPOSE_PROJECT_NAME}_cache_ui_5001'
+      SERVICE_5001_ID: '${COMPOSE_PROJECT_NAME}_cache_ui_http'
+      SERVICE_5001_NAME: '${COMPOSE_PROJECT_NAME}_cache_ui_http'
       SERVICE_5001_TAGS: 'proxy.enable=true,proxy.tags=external,proxy.frontend.entryPoints=http,proxy.frontend.rule=Host:${CACHE_UI_HOST}'
     links:
       - cache:services_cache
diff --git a/docker-compose.lab.yml b/docker-compose.lab.yml
@@ -4,21 +4,35 @@ services:
   php:
     environment:
       SYMFONY_ENV: dev
+    extra_hosts:
+      - 'api.assets.lab.ds:${PROXY_HOST}'
+      - 'api.authentication.lab.ds:${PROXY_HOST}'
+      - 'api.camunda.lab.ds:${PROXY_HOST}'
+      - 'api.cases.lab.ds:${PROXY_HOST}'
+      - 'api.cms.lab.ds:${PROXY_HOST}'
+      - 'api.discovery.lab.ds:${PROXY_HOST}'
+      - 'api.formio.lab.ds:${PROXY_HOST}'
+      - 'api.forms.lab.ds:${PROXY_HOST}'
+      - 'api.identities.lab.ds:${PROXY_HOST}'
+      - 'api.records.lab.ds:${PROXY_HOST}'
+      - 'api.services.lab.ds:${PROXY_HOST}'
+      - 'api.tasks.lab.ds:${PROXY_HOST}'
+      - 'api.tenants.lab.ds:${PROXY_HOST}'
 
   database_ui:
     image: adminer:4-standalone
     environment:
-      SERVICE_8080_ID: '${COMPOSE_PROJECT_NAME}_database_ui_8080'
-      SERVICE_8080_NAME: '${COMPOSE_PROJECT_NAME}_database_ui_8080'
+      SERVICE_8080_ID: '${COMPOSE_PROJECT_NAME}_database_ui_http'
+      SERVICE_8080_NAME: '${COMPOSE_PROJECT_NAME}_database_ui_http'
       SERVICE_8080_TAGS: 'proxy.enable=true,proxy.tags=external,proxy.frontend.entryPoints=http,proxy.frontend.rule=Host:${DATABASE_UI_HOST}'
     links:
       - database:services_database
 
   cache_ui:
     image: marian/rebrow
     environment:
-      SERVICE_5001_ID: '${COMPOSE_PROJECT_NAME}_cache_ui_5001'
-      SERVICE_5001_NAME: '${COMPOSE_PROJECT_NAME}_cache_ui_5001'
+      SERVICE_5001_ID: '${COMPOSE_PROJECT_NAME}_cache_ui_http'
+      SERVICE_5001_NAME: '${COMPOSE_PROJECT_NAME}_cache_ui_http'
       SERVICE_5001_TAGS: 'proxy.enable=true,proxy.tags=external,proxy.frontend.entryPoints=http,proxy.frontend.rule=Host:${CACHE_UI_HOST}'
     links:
       - cache:services_cache
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -5,3 +5,17 @@ services:
     image: 'digitalstate/services:${IMAGE_TAG}'
     environment:
       SYMFONY_ENV: prod
+    extra_hosts:
+      - 'api.assets.prod.ds:${PROXY_HOST}'
+      - 'api.authentication.prod.ds:${PROXY_HOST}'
+      - 'api.camunda.prod.ds:${PROXY_HOST}'
+      - 'api.cases.prod.ds:${PROXY_HOST}'
+      - 'api.cms.prod.ds:${PROXY_HOST}'
+      - 'api.discovery.prod.ds:${PROXY_HOST}'
+      - 'api.formio.prod.ds:${PROXY_HOST}'
+      - 'api.forms.prod.ds:${PROXY_HOST}'
+      - 'api.identities.prod.ds:${PROXY_HOST}'
+      - 'api.records.prod.ds:${PROXY_HOST}'
+      - 'api.services.prod.ds:${PROXY_HOST}'
+      - 'api.tasks.prod.ds:${PROXY_HOST}'
+      - 'api.tenants.prod.ds:${PROXY_HOST}'
diff --git a/docker-compose.stag.yml b/docker-compose.stag.yml
@@ -5,3 +5,17 @@ services:
     image: 'digitalstate/services:${IMAGE_TAG}'
     environment:
       SYMFONY_ENV: prod
+    extra_hosts:
+      - 'api.assets.stag.ds:${PROXY_HOST}'
+      - 'api.authentication.stag.ds:${PROXY_HOST}'
+      - 'api.camunda.stag.ds:${PROXY_HOST}'
+      - 'api.cases.stag.ds:${PROXY_HOST}'
+      - 'api.cms.stag.ds:${PROXY_HOST}'
+      - 'api.discovery.stag.ds:${PROXY_HOST}'
+      - 'api.formio.stag.ds:${PROXY_HOST}'
+      - 'api.forms.stag.ds:${PROXY_HOST}'
+      - 'api.identities.stag.ds:${PROXY_HOST}'
+      - 'api.records.stag.ds:${PROXY_HOST}'
+      - 'api.services.stag.ds:${PROXY_HOST}'
+      - 'api.tasks.stag.ds:${PROXY_HOST}'
+      - 'api.tenants.stag.ds:${PROXY_HOST}'
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -4,3 +4,17 @@ services:
   php:
     environment:
       SYMFONY_ENV: test
+    extra_hosts:
+      - 'api.assets.test.ds:${PROXY_HOST}'
+      - 'api.authentication.test.ds:${PROXY_HOST}'
+      - 'api.camunda.test.ds:${PROXY_HOST}'
+      - 'api.cases.test.ds:${PROXY_HOST}'
+      - 'api.cms.test.ds:${PROXY_HOST}'
+      - 'api.discovery.test.ds:${PROXY_HOST}'
+      - 'api.formio.test.ds:${PROXY_HOST}'
+      - 'api.forms.test.ds:${PROXY_HOST}'
+      - 'api.identities.test.ds:${PROXY_HOST}'
+      - 'api.records.test.ds:${PROXY_HOST}'
+      - 'api.services.test.ds:${PROXY_HOST}'
+      - 'api.tasks.test.ds:${PROXY_HOST}'
+      - 'api.tenants.test.ds:${PROXY_HOST}'
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -37,11 +37,11 @@ services:
     depends_on:
       - php
     environment:
-      SERVICE_443_ID: '${COMPOSE_PROJECT_NAME}_api_443'
-      SERVICE_443_NAME: '${COMPOSE_PROJECT_NAME}_api_443'
+      SERVICE_443_ID: '${COMPOSE_PROJECT_NAME}_api_https'
+      SERVICE_443_NAME: '${COMPOSE_PROJECT_NAME}_api_https'
       SERVICE_443_TAGS: 'proxy.enable=true,proxy.tags=external,proxy.frontend.entryPoints=https,proxy.frontend.rule=Host:${API_HOST}'
-      SERVICE_80_ID: '${COMPOSE_PROJECT_NAME}_api_80'
-      SERVICE_80_NAME: '${COMPOSE_PROJECT_NAME}_api_80'
+      SERVICE_80_ID: '${COMPOSE_PROJECT_NAME}_api_http'
+      SERVICE_80_NAME: '${COMPOSE_PROJECT_NAME}_api_http'
       SERVICE_80_TAGS: 'proxy.enable=true,proxy.tags=external,proxy.frontend.entryPoints=http,proxy.frontend.rule=Host:${API_HOST}'
     volumes:
       - '${DIRECTORY}/docker/nginx/conf.d:/etc/nginx/conf.d:ro'