From 25635601effe90a8ae6d6d0804c2a95290942a6a Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Fri, 20 Aug 2021 13:46:05 +0200 Subject: [PATCH 1/3] Make the configs more consistent with other projects - Move the prod config into the base file - remove duplicated config from the dev file --- docker-compose.dev.yml | 36 ++++++------------------------------ docker-compose.prod.yml | 32 -------------------------------- docker-compose.yml | 25 +++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 64 deletions(-) delete mode 100644 docker-compose.prod.yml diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 98be27d..fec0142 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,19 +1,7 @@ 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: + identifier: restart: "no" dispatcher: restart: "no" @@ -47,21 +35,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" \ No newline at end of file + - "80:80" + restart: "no" + frontend: + restart: "no" \ No newline at end of file diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml deleted file mode 100644 index a5cf203..0000000 --- a/docker-compose.prod.yml +++ /dev/null @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 35d6832..16f3e4a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -75,7 +75,6 @@ services: - "logging=true" restart: always logging: *default-logging - # Ember-Metis uri-info: image: redpencil/mu-uri-info-service:0.2.1 links: @@ -146,4 +145,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 \ No newline at end of file + 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 From 49873b36a90d4b1d15538fa63fb7fe8b67dc0e67 Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Fri, 20 Aug 2021 13:48:28 +0200 Subject: [PATCH 2/3] Remove the metis related services Metis isn't used at the moment. --- docker-compose.dev.yml | 6 ------ docker-compose.yml | 24 ------------------------ 2 files changed, 30 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index fec0142..cef3a71 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -17,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: diff --git a/docker-compose.yml b/docker-compose.yml index 16f3e4a..d68dee7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -75,30 +75,6 @@ services: - "logging=true" restart: always logging: *default-logging - 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: From ea8759f480ca1d55aa49c84a287d22658513eaa9 Mon Sep 17 00:00:00 2001 From: Aad Versteden Date: Sat, 18 Sep 2021 09:17:00 +0200 Subject: [PATCH 3/3] Remove spurious whitespace at end of line Note: I've added a newline at the end of the file too as that's what I see in the other file but I don't think anyone will really care about that. --- docker-compose.dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index cef3a71..6a71303 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,12 +1,12 @@ version: '3.4' services: - identifier: + identifier: restart: "no" dispatcher: restart: "no" triplestore: - ports: + ports: - "8890:8890" restart: "no" db: @@ -34,4 +34,4 @@ services: - "80:80" restart: "no" frontend: - restart: "no" \ No newline at end of file + restart: "no"