Merge pull request #30 from lblod/refactor/docker-compose-configs

docker-compose config refactoring

docker-compose.dev.yml

@@ -1,24 +1,12 @@
 version: '3.4'
 
 services:
-  web:
-    image: nginx
-    volumes:
-       - ./config/proxy:/etc/nginx/conf.d
-       - ./config/proxy/web.conf:/etc/nginx/nginx.conf:ro
-    links:
-      - identifier:identifier
-    labels:
-      - "logging=true"
-    restart: always
-    ports:
-      - "80:80"
   identifier:
     restart: "no"
   dispatcher:
     restart: "no"
   triplestore:
-    ports: 
+    ports:
       - "8890:8890"
     restart: "no"
   db:
@@ -29,12 +17,6 @@ services:
     restart: "no"
   cache:
     restart: "no"
-  uri-info:
-    restart: "no"
-  resource-labels-cache:
-    restart: "no"
-  resource-labels:
-    restart: "no"
   kalliope-api:
     restart: "no"
   deltanotifier:
@@ -47,21 +29,9 @@ services:
     restart: "no"
   login:
     restart: "no"
-  frontend:
-    image: lblod/frontend-contact-hub:latest
-    labels:
-      - "logging=true"
-    restart: always
-    environment: 
-     EMBER_OAUTH_API_REDIRECT_URL: "https://organisaties.abb.lblod.info/authorization/callback"
-     EMBER_OAUTH_API_KEY: "677af572-2e2f-4e61-ad38-036723bb314c"
-     EMBER_OAUTH_API_BASE_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/auth"
-     EMBER_OAUTH_API_LOGOUT_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/logout"
-     EMBER_OAUTH_API_SCOPE: "openid vo profile abb_organisatieportaal"
-    restart: always
-  proxy:
-    image: nginx:1.13
-    volumes:
-      - ./config/proxy-https:/etc/nginx/conf.d
+  web:
     ports:
-      - "443:443"
+      - "80:80"
+    restart: "no"
+  frontend:
+    restart: "no"

docker-compose.prod.yml

@@ -1,32 +0,0 @@
-version: '3.4'
-
-x-logging:
-  &default-logging
-  driver: "json-file"
-  options:
-    max-size: "10m"
-    max-file: "3"
-
-services:
-  web:
-    image: nginx
-    volumes:
-       - ./config/proxy:/etc/nginx/conf.d
-       - ./config/proxy/web.conf:/etc/nginx/nginx.conf:ro
-    links:
-      - identifier:identifier
-    labels:
-      - "logging=true"
-    restart: always
-    logging: *default-logging
-  frontend:
-    image: lblod/frontend-contact-hub:1.0.0
-    labels:
-      - "logging=true"
-    environment: 
-     EMBER_OAUTH_API_REDIRECT_URL: "https://organisaties.abb.lblod.info/authorization/callback"
-     EMBER_OAUTH_API_KEY: "677af572-2e2f-4e61-ad38-036723bb314c"
-     EMBER_OAUTH_API_BASE_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/auth"
-     EMBER_OAUTH_API_LOGOUT_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/logout"
-     EMBER_OAUTH_API_SCOPE: "openid vo profile abb_organisatieportaal"
-    restart: always

docker-compose.yml

@@ -75,31 +75,6 @@ services:
       - "logging=true"
     restart: always
     logging: *default-logging
-  # Ember-Metis
-  uri-info:
-    image: redpencil/mu-uri-info-service:0.2.1
-    links:
-      - db:database
-    restart: always
-    logging: *default-logging
-    labels:
-      - "logging=true"
-  resource-labels-cache:
-    image: semtech/mu-cache:2.0.1
-    links:
-      - resource-labels:backend
-    restart: always
-    logging: *default-logging
-    labels:
-      - "logging=true"
-  resource-labels:
-    image: lblod/resource-label-service:0.3.1
-    links:
-      - db:database
-    restart: always
-    logging: *default-logging
-    labels:
-      - "logging=true"
   kalliope-api:
     image: lblod/jsonld-delta-service:0.2.0
     volumes:
@@ -146,4 +121,26 @@ services:
       DEFAULT_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
       SESSION_GRAPH: "http://mu.semte.ch/graphs/sessions"
   adressenregister:
-    image: lblod/adressenregister-fuzzy-search-service:0.5.0
+    image: lblod/adressenregister-fuzzy-search-service:0.5.0
+  web:
+    image: nginx
+    volumes:
+       - ./config/proxy:/etc/nginx/conf.d
+       - ./config/proxy/web.conf:/etc/nginx/nginx.conf:ro
+    links:
+      - identifier:identifier
+    labels:
+      - "logging=true"
+    restart: always
+    logging: *default-logging
+  frontend:
+    image: lblod/frontend-contact-hub:1.0.0
+    labels:
+      - "logging=true"
+    environment:
+      EMBER_OAUTH_API_REDIRECT_URL: "https://organisaties.abb.lblod.info/authorization/callback"
+      EMBER_OAUTH_API_KEY: "677af572-2e2f-4e61-ad38-036723bb314c"
+      EMBER_OAUTH_API_BASE_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/auth"
+      EMBER_OAUTH_API_LOGOUT_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/logout"
+      EMBER_OAUTH_API_SCOPE: "openid vo profile abb_organisatieportaal"
+    restart: always