From aa5cf9b3bc5d4180d9330e7bd179ecfa9dbbe271 Mon Sep 17 00:00:00 2001 From: Croft Date: Mon, 23 May 2022 14:52:06 +0200 Subject: [PATCH 1/5] Corrected some problems with GBN docker-compose.yml Running: ./bridgehead stop gbn led to error messages, which have been fixed with changes to the docker-compose.yml file. --- gbn/docker-compose.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gbn/docker-compose.yml b/gbn/docker-compose.yml index 476d355..9428311 100644 --- a/gbn/docker-compose.yml +++ b/gbn/docker-compose.yml @@ -4,11 +4,13 @@ volumes: gbn-connector-logs: gbn-connector-db-data: gbn-store-db-data: + bridgehead-proxy: + blaze-data: services: traefik: container_name: bridgehead-traefik - image: traefik:2 + image: traefik:2.4 command: - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 @@ -44,7 +46,7 @@ services: landing: container_name: bridgehead-landingpage - image: samply/bridgehead-landingpage + image: samply/bridgehead-landingpage:master labels: - "traefik.enable=true" - "traefik.http.routers.landing.rule=PathPrefix(`/`)" From 8cc5e66400b2e5401b4abbc0563ef63a8b36ff58 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Mon, 23 May 2022 16:05:56 +0200 Subject: [PATCH 2/5] Fixed docker-compose for gbn --- gbn/docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gbn/docker-compose.yml b/gbn/docker-compose.yml index 9428311..0f70740 100644 --- a/gbn/docker-compose.yml +++ b/gbn/docker-compose.yml @@ -10,7 +10,7 @@ volumes: services: traefik: container_name: bridgehead-traefik - image: traefik:2.4 + image: traefik:latest command: - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 @@ -87,12 +87,14 @@ services: - "traefik.enable=true" - "traefik.http.routers.gbn_connector.rule=PathPrefix(`/gbn-connector`)" - "traefik.http.services.gbn_connector.loadbalancer.server.port=8080" + - "traefik.http.routers.gbn_connector.tls=true" depends_on: - "gbn-connector-db" restart: "always" gbn-connector-db: image: "postgres:10.17" + container_name: "bridgehead-gbn-connector-db" environment: POSTGRES_DB: "samply.connector" POSTGRES_USER: "samply" From 0f52eabc152d0c97d7358049a12812844f790f7b Mon Sep 17 00:00:00 2001 From: Croft Date: Mon, 23 May 2022 16:16:04 +0200 Subject: [PATCH 3/5] Name for Connector DB container is needed This needs to match with the name defined in: https://github.com/samply/share-client/blob/feature/environmentPreconfiguration/Dockerfile for POSTGRES_HOST under 'gbn' --- gbn/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/gbn/docker-compose.yml b/gbn/docker-compose.yml index 9428311..a7fee4a 100644 --- a/gbn/docker-compose.yml +++ b/gbn/docker-compose.yml @@ -92,6 +92,7 @@ services: restart: "always" gbn-connector-db: + container_name: bridgehead-gbn-connector-db image: "postgres:10.17" environment: POSTGRES_DB: "samply.connector" From a18e198f21bb433484b1503a676ba640c43ba57f Mon Sep 17 00:00:00 2001 From: Croft Date: Wed, 1 Jun 2022 09:22:12 +0200 Subject: [PATCH 4/5] Gave Traefik container a fixed version --- gbn/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gbn/docker-compose.yml b/gbn/docker-compose.yml index 7778e28..6f811e7 100644 --- a/gbn/docker-compose.yml +++ b/gbn/docker-compose.yml @@ -10,7 +10,7 @@ volumes: services: traefik: container_name: bridgehead-traefik - image: traefik:latest + image: traefik:2.4 command: - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 From 72e1b8ed599b97fb9350c644eec8fa26ae5975e2 Mon Sep 17 00:00:00 2001 From: Croft Date: Thu, 2 Jun 2022 14:21:11 +0200 Subject: [PATCH 5/5] Responses to suggestions, 1 new fix Two suggestions have been implemented and tested, namely, changing the Postgres version to 10 and changing the Traefik version to "latest". A further changes was necessary, because in: https://github.com/samply/share-client/blob/feature/environmentPreconfiguration/Dockerfile under "Stage used by ci for gbn images", STORE_URL is: http://bridgehead-gbn-blaze-store:8080 To make this work, I also needed to change the container name for Blaze in docker-compose.yml for GBN. --- gbn/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gbn/docker-compose.yml b/gbn/docker-compose.yml index 6f811e7..9018205 100644 --- a/gbn/docker-compose.yml +++ b/gbn/docker-compose.yml @@ -10,7 +10,7 @@ volumes: services: traefik: container_name: bridgehead-traefik - image: traefik:2.4 + image: traefik:latest command: - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 @@ -59,7 +59,7 @@ services: blaze: image: "samply/blaze:0.17" - container_name: bridgehead-gbn-blaze + container_name: bridgehead-gbn-blaze-store environment: BASE_URL: "http://blaze:8080" JAVA_TOOL_OPTIONS: "-Xmx4g" @@ -94,7 +94,7 @@ services: gbn-connector-db: container_name: bridgehead-gbn-connector-db - image: "postgres:10.17" + image: "postgres:10" container_name: "bridgehead-gbn-connector-db" environment: POSTGRES_DB: "samply.connector"