From aef2d812c5e3d2ae1fd9f339aaebf9147952c196 Mon Sep 17 00:00:00 2001 From: a-ghanem Date: Fri, 14 Jan 2022 11:13:09 +0100 Subject: [PATCH 01/11] Use pinned tags --- docker-template.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-template.yml b/docker-template.yml index a2fd114..cc058ba 100644 --- a/docker-template.yml +++ b/docker-template.yml @@ -21,7 +21,7 @@ services: - /tmp/tsd:/tsd/p11/data/durable/apps/ega/ db: - image: ghcr.io/neicnordic/sda-db:latest + image: ghcr.io/neicnordic/sda-db:v1.4.0 ports: - 5432:5432 deploy: @@ -93,7 +93,7 @@ services: # Public stack proxy: - image: ghcr.io/uio-bmi/localega-tsd-proxy:latest + image: ghcr.io/uio-bmi/localega-tsd-proxy:v1.0.1 ports: - 443:8080 deploy: @@ -131,7 +131,7 @@ services: target: /etc/ega/jwt/visa.pem interceptor: - image: ghcr.io/uio-bmi/mq-interceptor:latest + image: ghcr.io/uio-bmi/mq-interceptor:v1.0.0 deploy: restart_policy: condition: on-failure @@ -162,7 +162,7 @@ services: # Private stack ingest: - image: ghcr.io/neicnordic/sda-pipeline:latest + image: ghcr.io/neicnordic/sda-pipeline:v0.2.5 deploy: restart_policy: condition: on-failure @@ -219,7 +219,7 @@ services: command: "sda-ingest" verify: - image: ghcr.io/neicnordic/sda-pipeline:latest + image: ghcr.io/neicnordic/sda-pipeline:v0.2.5 deploy: restart_policy: condition: on-failure @@ -273,7 +273,7 @@ services: command: "sda-verify" finalize: - image: ghcr.io/neicnordic/sda-pipeline:latest + image: ghcr.io/neicnordic/sda-pipeline:v0.2.5 deploy: restart_policy: condition: on-failure @@ -319,7 +319,7 @@ services: mode: 0600 mapper: - image: ghcr.io/neicnordic/sda-pipeline:latest + image: ghcr.io/neicnordic/sda-pipeline:v0.2.5 deploy: restart_policy: condition: on-failure @@ -364,7 +364,7 @@ services: mode: 0600 doa: - image: neicnordic/sda-doa:release-v1.6.0 + image: ghcr.io/neicnordic/sda-doa:v1.6.3 ports: - 80:8080 deploy: From 907cf9609a33e61d623ec6df307613515046cc5b Mon Sep 17 00:00:00 2001 From: a-ghanem Date: Thu, 3 Feb 2022 10:46:32 +0100 Subject: [PATCH 02/11] Use neicnordic/sda-doa:release-v1.6.0 --- docker-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-template.yml b/docker-template.yml index cc058ba..255e8e1 100644 --- a/docker-template.yml +++ b/docker-template.yml @@ -364,7 +364,7 @@ services: mode: 0600 doa: - image: ghcr.io/neicnordic/sda-doa:v1.6.3 + image: neicnordic/sda-doa:release-v1.6.0 ports: - 80:8080 deploy: From f2ad16fcd4e1ccfbab5ca08fe6e2a797b6f83d4e Mon Sep 17 00:00:00 2001 From: a-ghanem Date: Thu, 3 Feb 2022 10:55:49 +0100 Subject: [PATCH 03/11] Use ghcr.io/uio-bmi/localega-tsd-proxy:v1.0.3 --- docker-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-template.yml b/docker-template.yml index 255e8e1..4383266 100644 --- a/docker-template.yml +++ b/docker-template.yml @@ -93,7 +93,7 @@ services: # Public stack proxy: - image: ghcr.io/uio-bmi/localega-tsd-proxy:v1.0.1 + image: ghcr.io/uio-bmi/localega-tsd-proxy:v1.0.3 ports: - 443:8080 deploy: From 21eb1e76f1f54f28e1d3c6c081e8d42e602866fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 01:00:08 +0000 Subject: [PATCH 04/11] Bump postgresql from 42.2.8 to 42.2.25 Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.8 to 42.2.25. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.8...REL42.2.25) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index deea7af..f6b3c96 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ org.postgresql postgresql - 42.2.8 + 42.2.25 test From bdcb5209c478a4132fe59194dd1eda3119798570 Mon Sep 17 00:00:00 2001 From: a-ghanem Date: Thu, 3 Feb 2022 11:00:22 +0100 Subject: [PATCH 05/11] Use postgres:latest --- docker-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-template.yml b/docker-template.yml index 4383266..fc8f060 100644 --- a/docker-template.yml +++ b/docker-template.yml @@ -146,7 +146,7 @@ services: - LEGA_MQ_EXCHANGE=sda postgres: - image: postgres + image: postgres:latest ports: - 5433:5432 deploy: From 692b2bded4f5ca2a86fb9d8573c6722119fa0df5 Mon Sep 17 00:00:00 2001 From: a-ghanem Date: Thu, 3 Feb 2022 11:45:08 +0100 Subject: [PATCH 06/11] Use ghcr.io/neicnordic/sda-pipeline:v0.2.13 --- docker-template.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-template.yml b/docker-template.yml index fc8f060..dbdebb5 100644 --- a/docker-template.yml +++ b/docker-template.yml @@ -162,7 +162,7 @@ services: # Private stack ingest: - image: ghcr.io/neicnordic/sda-pipeline:v0.2.5 + image: ghcr.io/neicnordic/sda-pipeline:v0.2.13 deploy: restart_policy: condition: on-failure @@ -219,7 +219,7 @@ services: command: "sda-ingest" verify: - image: ghcr.io/neicnordic/sda-pipeline:v0.2.5 + image: ghcr.io/neicnordic/sda-pipeline:v0.2.13 deploy: restart_policy: condition: on-failure @@ -273,7 +273,7 @@ services: command: "sda-verify" finalize: - image: ghcr.io/neicnordic/sda-pipeline:v0.2.5 + image: ghcr.io/neicnordic/sda-pipeline:v0.2.13 deploy: restart_policy: condition: on-failure @@ -319,7 +319,7 @@ services: mode: 0600 mapper: - image: ghcr.io/neicnordic/sda-pipeline:v0.2.5 + image: ghcr.io/neicnordic/sda-pipeline:v0.2.13 deploy: restart_policy: condition: on-failure From e5a316edf093b5955edf3c999bc7599437801d40 Mon Sep 17 00:00:00 2001 From: a-ghanem Date: Wed, 16 Feb 2022 11:31:16 +0100 Subject: [PATCH 07/11] Use ghcr.io/uio-bmi/localega-broker:v1.0.0 --- docker-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-template.yml b/docker-template.yml index dbdebb5..ef782ec 100644 --- a/docker-template.yml +++ b/docker-template.yml @@ -62,7 +62,7 @@ services: retries: 3 mq: - image: ghcr.io/uio-bmi/localega-broker-private:latest + image: ghcr.io/uio-bmi/localega-broker:v1.0.0 ports: - 5671:5671 - 15671:15671 From bdaddae01e13d70f417031eb737e1d4842120ff1 Mon Sep 17 00:00:00 2001 From: Ahmed Ghanem Date: Fri, 12 Aug 2022 09:33:14 +0200 Subject: [PATCH 08/11] Testing Java 17 built DOA service --- docker-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-template.yml b/docker-template.yml index ef782ec..569b22b 100644 --- a/docker-template.yml +++ b/docker-template.yml @@ -364,7 +364,7 @@ services: mode: 0600 doa: - image: neicnordic/sda-doa:release-v1.6.0 + image: ghcr.io/neicnordic/sda-doa:testjava17_aug22 ports: - 80:8080 deploy: From 09d50945f5008aea0bc3eb4ba122cbb0390b154c Mon Sep 17 00:00:00 2001 From: Ahmed Ghanem Date: Wed, 17 Aug 2022 13:06:08 +0200 Subject: [PATCH 09/11] Use ghcr.io/neicnordic/sda-db:v1.4.5 --- docker-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-template.yml b/docker-template.yml index 569b22b..2affae3 100644 --- a/docker-template.yml +++ b/docker-template.yml @@ -21,7 +21,7 @@ services: - /tmp/tsd:/tsd/p11/data/durable/apps/ega/ db: - image: ghcr.io/neicnordic/sda-db:v1.4.0 + image: ghcr.io/neicnordic/sda-db:v1.4.5 ports: - 5432:5432 deploy: From be09e19c649ace8e3f5cea13e18a97b8cca2902e Mon Sep 17 00:00:00 2001 From: Ahmed Ghanem Date: Wed, 17 Aug 2022 13:07:39 +0200 Subject: [PATCH 10/11] Use ghcr.io/uio-bmi/localega-tsd-proxy:v1.0.7 --- docker-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-template.yml b/docker-template.yml index 2affae3..587f177 100644 --- a/docker-template.yml +++ b/docker-template.yml @@ -93,7 +93,7 @@ services: # Public stack proxy: - image: ghcr.io/uio-bmi/localega-tsd-proxy:v1.0.3 + image: ghcr.io/uio-bmi/localega-tsd-proxy:v1.0.7 ports: - 443:8080 deploy: From c92f6e7227b34ad768587015c71379b373c6287f Mon Sep 17 00:00:00 2001 From: Ahmed Ghanem Date: Wed, 17 Aug 2022 13:08:28 +0200 Subject: [PATCH 11/11] Use ghcr.io/neicnordic/sda-pipeline:v0.3.39 --- docker-template.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docker-template.yml b/docker-template.yml index 587f177..0656968 100644 --- a/docker-template.yml +++ b/docker-template.yml @@ -162,7 +162,7 @@ services: # Private stack ingest: - image: ghcr.io/neicnordic/sda-pipeline:v0.2.13 + image: ghcr.io/neicnordic/sda-pipeline:v0.3.39 deploy: restart_policy: condition: on-failure @@ -219,7 +219,7 @@ services: command: "sda-ingest" verify: - image: ghcr.io/neicnordic/sda-pipeline:v0.2.13 + image: ghcr.io/neicnordic/sda-pipeline:v0.3.39 deploy: restart_policy: condition: on-failure @@ -252,6 +252,8 @@ services: - DB_SSLMODE=require - DB_CLIENTCERT=/etc/ega/client.cert - DB_CLIENTKEY=/etc/ega/client-key.cert + - INBOX_TYPE=posix + - INBOX_LOCATION=/ega/inbox - LOG_LEVEL=debug secrets: - source: rootCA.pem @@ -269,11 +271,12 @@ services: - source: ega.sec.pem target: /etc/ega/ega.sec volumes: + - /tmp/tsd:/ega/inbox - /tmp/vault:/ega/archive command: "sda-verify" finalize: - image: ghcr.io/neicnordic/sda-pipeline:v0.2.13 + image: ghcr.io/neicnordic/sda-pipeline:v0.3.39 deploy: restart_policy: condition: on-failure @@ -319,7 +322,7 @@ services: mode: 0600 mapper: - image: ghcr.io/neicnordic/sda-pipeline:v0.2.13 + image: ghcr.io/neicnordic/sda-pipeline:v0.3.39 deploy: restart_policy: condition: on-failure