From b148c5d32b74735babf7da2776781d22fa1e7cab Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Thu, 9 Jul 2026 10:49:54 +0100 Subject: [PATCH 1/3] Update docker image to 'standard' version --- docker-compose_armadillo.yml | 3 ++- docker-compose_opal.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-compose_armadillo.yml b/docker-compose_armadillo.yml index dba71daf..bfc84e06 100644 --- a/docker-compose_armadillo.yml +++ b/docker-compose_armadillo.yml @@ -3,7 +3,8 @@ services: hostname: armadillo ports: - 8080:8080 - image: datashield/armadillo_citest:latest + image: molgenis/molgenis-armadillo:latest +# image: datashield/armadillo_citest:latest environment: LOGGING_CONFIG: 'classpath:logback-file.xml' AUDIT_LOG_PATH: '/app/logs/audit.log' diff --git a/docker-compose_opal.yml b/docker-compose_opal.yml index 70bffd8d..8e6a560a 100644 --- a/docker-compose_opal.yml +++ b/docker-compose_opal.yml @@ -1,6 +1,7 @@ services: opal: - image: datashield/opal_citest:latest + image: obiba/opal:latest +# image: datashield/opal_citest:latest ports: - 8443:8443 - 8080:8080 From 0507e04e2f3d11fde3193cae95fb1811c4b38675 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Mon, 13 Jul 2026 15:19:24 +0100 Subject: [PATCH 2/3] Switch images --- docker-compose_armadillo.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose_armadillo.yml b/docker-compose_armadillo.yml index bfc84e06..f0cf4a55 100644 --- a/docker-compose_armadillo.yml +++ b/docker-compose_armadillo.yml @@ -18,6 +18,7 @@ services: default: hostname: default - image: datashield/rock_citest-permissive:latest +# image: datashield/rock_citest-permissive:latest + image: datashield/rock-tulip-donkey-permissive:3.0.0 environment: DEBUG: "FALSE" From 0e1bae5374ba2c24e64ee94a801ed35689e2e049 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Tue, 14 Jul 2026 11:17:13 +0100 Subject: [PATCH 3/3] Revert docker composition files --- docker-compose_armadillo.yml | 6 ++---- docker-compose_opal.yml | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docker-compose_armadillo.yml b/docker-compose_armadillo.yml index f0cf4a55..dba71daf 100644 --- a/docker-compose_armadillo.yml +++ b/docker-compose_armadillo.yml @@ -3,8 +3,7 @@ services: hostname: armadillo ports: - 8080:8080 - image: molgenis/molgenis-armadillo:latest -# image: datashield/armadillo_citest:latest + image: datashield/armadillo_citest:latest environment: LOGGING_CONFIG: 'classpath:logback-file.xml' AUDIT_LOG_PATH: '/app/logs/audit.log' @@ -18,7 +17,6 @@ services: default: hostname: default -# image: datashield/rock_citest-permissive:latest - image: datashield/rock-tulip-donkey-permissive:3.0.0 + image: datashield/rock_citest-permissive:latest environment: DEBUG: "FALSE" diff --git a/docker-compose_opal.yml b/docker-compose_opal.yml index 8e6a560a..70bffd8d 100644 --- a/docker-compose_opal.yml +++ b/docker-compose_opal.yml @@ -1,7 +1,6 @@ services: opal: - image: obiba/opal:latest -# image: datashield/opal_citest:latest + image: datashield/opal_citest:latest ports: - 8443:8443 - 8080:8080