Update Test Container Docker Images

medizininformatik-initiative · Sep 11, 2024 · 9d632f2 · 9d632f2
1 parent 8a1eae6
commit 9d632f2
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 22 deletions.
diff --git a/...formatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplBaseIT.java b/...formatik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplBaseIT.java
@@ -12,13 +12,13 @@ public abstract class FlareWebserviceClientImplBaseIT {
 
     protected static final Network DEFAULT_CONTAINER_NETWORK = Network.newNetwork();
 
-    public static GenericContainer<?> fhirServer = new GenericContainer<>(DockerImageName.parse("samply/blaze:0.24"))
+    public static GenericContainer<?> fhirServer = new GenericContainer<>(DockerImageName.parse("samply/blaze:0.30"))
             .withExposedPorts(8080)
             .withNetwork(DEFAULT_CONTAINER_NETWORK)
             .withNetworkAliases("fhir-server")
             .withEnv("LOG_LEVEL", "debug");
 
-    public static GenericContainer<?> flare = new GenericContainer<>(DockerImageName.parse("ghcr.io/medizininformatik-initiative/flare:2.1.0"))
+    public static GenericContainer<?> flare = new GenericContainer<>(DockerImageName.parse("ghcr.io/medizininformatik-initiative/flare:2.3.0"))
             .withExposedPorts(8080)
             .withNetwork(DEFAULT_CONTAINER_NETWORK)
             .withNetworkAliases("flare")

diff --git a/...iative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthIT.java b/...iative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthIT.java
@@ -31,7 +31,7 @@ public class FlareWebserviceClientImplFwdProxyBasicAuthIT extends FlareWebservic
 
     @Container
     public static GenericContainer<?> forwardProxy = new GenericContainer<>(
-            DockerImageName.parse("ubuntu/squid:6.1-23.10_edge"))
+            DockerImageName.parse("ubuntu/squid:6.6-24.04_edge"))
                     .withExposedPorts(8080)
                     .withFileSystemBind(squidProxyConf.getPath(), "/etc/squid/squid.conf", READ_ONLY)
                     .withFileSystemBind(passwordFile.getPath(), "/etc/squid/passwd", READ_ONLY)

diff --git a/...ity/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyBearerTokenAuthIT.java b/...ity/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyBearerTokenAuthIT.java
@@ -35,7 +35,7 @@ public class FlareWebserviceClientImplFwdProxyBasicAuthRevProxyBearerTokenAuthIT
 
     @Container
     public static GenericContainer<?> proxy = new GenericContainer<>(
-            DockerImageName.parse("nginx:1.25.1"))
+            DockerImageName.parse("nginx:1.27.1"))
                     .withExposedPorts(8080)
                     .withFileSystemBind(nginxConf.getPath(), "/etc/nginx/nginx.conf", READ_ONLY)
                     .withFileSystemBind(indexFile.getPath(), "/usr/share/nginx/html/index.html", READ_ONLY)
@@ -47,7 +47,7 @@ public class FlareWebserviceClientImplFwdProxyBasicAuthRevProxyBearerTokenAuthIT
                     .dependsOn(flare);
     @Container
     public static GenericContainer<?> forwardProxy = new GenericContainer<>(
-            DockerImageName.parse("ubuntu/squid:6.1-23.10_edge"))
+            DockerImageName.parse("ubuntu/squid:6.6-24.04_edge"))
                     .withExposedPorts(8080)
                     .withFileSystemBind(squidProxyConf.getPath(), "/etc/squid/squid.conf", READ_ONLY)
                     .withFileSystemBind(forwardProxyPasswordFile.getPath(), "/etc/squid/passwd", READ_ONLY)

diff --git a/...ess/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyTlsIT.java b/...ess/feasibility/client/flare/FlareWebserviceClientImplFwdProxyBasicAuthRevProxyTlsIT.java
@@ -37,7 +37,7 @@ public class FlareWebserviceClientImplFwdProxyBasicAuthRevProxyTlsIT extends Fla
 
     @Container
     public static GenericContainer<?> proxy = new GenericContainer<>(
-            DockerImageName.parse("nginx:1.25.1"))
+            DockerImageName.parse("nginx:1.27.1"))
                     .withExposedPorts(8443)
                     .withFileSystemBind(nginxConf.getPath(), "/etc/nginx/nginx.conf", READ_ONLY)
                     .withFileSystemBind(indexFile.getPath(), "/usr/share/nginx/html/index.html", READ_ONLY)
@@ -52,7 +52,7 @@ public class FlareWebserviceClientImplFwdProxyBasicAuthRevProxyTlsIT extends Fla
 
     @Container
     public static GenericContainer<?> forwardProxy = new GenericContainer<>(
-            DockerImageName.parse("ubuntu/squid:6.1-23.10_edge"))
+            DockerImageName.parse("ubuntu/squid:6.6-24.04_edge"))
                     .withExposedPorts(8080)
                     .withFileSystemBind(squidProxyConf.getPath(), "/etc/squid/squid.conf", READ_ONLY)
                     .withFileSystemBind(passwordFile.getPath(), "/etc/squid/passwd", READ_ONLY)

diff --git a/...atik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyIT.java b/...atik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplFwdProxyIT.java
@@ -30,7 +30,7 @@ public class FlareWebserviceClientImplFwdProxyIT extends FlareWebserviceClientIm
 
     @Container
     public static GenericContainer<?> forwardProxy = new GenericContainer<>(
-            DockerImageName.parse("ubuntu/squid:6.1-23.10_edge"))
+            DockerImageName.parse("ubuntu/squid:6.6-24.04_edge"))
                     .withExposedPorts(8080)
                     .withFileSystemBind(squidProxyConf.getPath(), "/etc/squid/squid.conf", READ_ONLY)
                     .withNetwork(DEFAULT_CONTAINER_NETWORK)

diff --git a/...ive/process/feasibility/client/flare/FlareWebserviceClientImplFwdRevProxyBasicAuthIT.java b/...ive/process/feasibility/client/flare/FlareWebserviceClientImplFwdRevProxyBasicAuthIT.java
@@ -35,7 +35,7 @@ public class FlareWebserviceClientImplFwdRevProxyBasicAuthIT extends FlareWebser
 
     @Container
     public static GenericContainer<?> proxy = new GenericContainer<>(
-            DockerImageName.parse("nginx:1.25.1"))
+            DockerImageName.parse("nginx:1.27.1"))
                     .withExposedPorts(8080)
                     .withFileSystemBind(nginxConf.getPath(), "/etc/nginx/nginx.conf", READ_ONLY)
                     .withFileSystemBind(indexFile.getPath(), "/usr/share/nginx/html/index.html", READ_ONLY)
@@ -48,7 +48,7 @@ public class FlareWebserviceClientImplFwdRevProxyBasicAuthIT extends FlareWebser
                     .dependsOn(flare);
     @Container
     public static GenericContainer<?> forwardProxy = new GenericContainer<>(
-            DockerImageName.parse("ubuntu/squid:6.1-23.10_edge"))
+            DockerImageName.parse("ubuntu/squid:6.6-24.04_edge"))
                     .withExposedPorts(8080)
                     .withFileSystemBind(squidProxyConf.getPath(), "/etc/squid/squid.conf", READ_ONLY)
                     .withFileSystemBind(forwardProxyPasswordFile.getPath(), "/etc/squid/passwd", READ_ONLY)

diff --git a/...iative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyBasicAuthIT.java b/...iative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyBasicAuthIT.java
@@ -35,7 +35,7 @@ public class FlareWebserviceClientImplRevProxyBasicAuthIT extends FlareWebservic
 
     @Container
     public static GenericContainer<?> proxy = new GenericContainer<>(
-            DockerImageName.parse("nginx:1.25.1"))
+            DockerImageName.parse("nginx:1.27.1"))
                     .withExposedPorts(8080)
                     .withFileSystemBind(nginxConf.getPath(), "/etc/nginx/nginx.conf", READ_ONLY)
                     .withFileSystemBind(indexFile.getPath(), "/usr/share/nginx/html/index.html", READ_ONLY)

diff --git a/.../process/feasibility/client/flare/FlareWebserviceClientImplRevProxyBearerTokenAuthIT.java b/.../process/feasibility/client/flare/FlareWebserviceClientImplRevProxyBearerTokenAuthIT.java
@@ -34,7 +34,7 @@ public class FlareWebserviceClientImplRevProxyBearerTokenAuthIT extends FlareWeb
 
     @Container
     public static GenericContainer<?> proxy = new GenericContainer<>(
-            DockerImageName.parse("nginx:1.25.1"))
+            DockerImageName.parse("nginx:1.27.1"))
                     .withExposedPorts(8080)
                     .withFileSystemBind(nginxConf.getPath(), "/etc/nginx/nginx.conf", READ_ONLY)
                     .withFileSystemBind(indexFile.getPath(), "/usr/share/nginx/html/index.html", READ_ONLY)

diff --git a/...ive/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsBasicAuthIT.java b/...ive/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsBasicAuthIT.java
@@ -38,7 +38,7 @@ public class FlareWebserviceClientImplRevProxyTlsBasicAuthIT extends FlareWebser
 
     @Container
     public static GenericContainer<?> proxy = new GenericContainer<>(
-            DockerImageName.parse("nginx:1.25.1"))
+            DockerImageName.parse("nginx:1.27.1"))
                     .withExposedPorts(8443)
                     .withFileSystemBind(nginxConf.getPath(), "/etc/nginx/nginx.conf", READ_ONLY)
                     .withFileSystemBind(indexFile.getPath(), "/usr/share/nginx/html/index.html", READ_ONLY)

diff --git a/...ve/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsClientCertIT.java b/...ve/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsClientCertIT.java
@@ -36,7 +36,7 @@ public class FlareWebserviceClientImplRevProxyTlsClientCertIT extends FlareWebse
 
     @Container
     public static GenericContainer<?> proxy = new GenericContainer<>(
-            DockerImageName.parse("nginx:1.25.1"))
+            DockerImageName.parse("nginx:1.27.1"))
                     .withExposedPorts(8443)
                     .withFileSystemBind(nginxConf.getPath(), "/etc/nginx/nginx.conf", READ_ONLY)
                     .withFileSystemBind(indexFile.getPath(), "/usr/share/nginx/html/index.html", READ_ONLY)

diff --git a/...k_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsIT.java b/...k_initiative/process/feasibility/client/flare/FlareWebserviceClientImplRevProxyTlsIT.java
@@ -35,7 +35,7 @@ public class FlareWebserviceClientImplRevProxyTlsIT extends FlareWebserviceClien
 
     @Container
     public static GenericContainer<?> proxy = new GenericContainer<>(
-            DockerImageName.parse("nginx:1.25.1"))
+            DockerImageName.parse("nginx:1.27.1"))
                     .withExposedPorts(8443)
                     .withFileSystemBind(nginxConf.getPath(), "/etc/nginx/nginx.conf", READ_ONLY)
                     .withFileSystemBind(indexFile.getPath(), "/usr/share/nginx/html/index.html", READ_ONLY)

diff --git a/...atik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplTimeoutsIT.java b/...atik_initiative/process/feasibility/client/flare/FlareWebserviceClientImplTimeoutsIT.java
@@ -44,7 +44,7 @@ public class FlareWebserviceClientImplTimeoutsIT extends FlareWebserviceClientIm
     @Autowired protected FlareWebserviceClient flareClient;
 
     @Container
-    public static ToxiproxyContainer toxiproxy = new ToxiproxyContainer("ghcr.io/shopify/toxiproxy:2.7.0")
+    public static ToxiproxyContainer toxiproxy = new ToxiproxyContainer("ghcr.io/shopify/toxiproxy:2.9.0")
             .withNetwork(DEFAULT_CONTAINER_NETWORK)
             .dependsOn(flare);
     private static ToxiproxyClient toxiproxyClient;

diff --git a/.../de/medizininformatik_initiative/process/feasibility/client/store/OAuthInterceptorIT.java b/.../de/medizininformatik_initiative/process/feasibility/client/store/OAuthInterceptorIT.java
@@ -59,15 +59,15 @@ public class OAuthInterceptorIT {
 
     @Container
     public static GenericContainer<?> forwardProxyNoAuth = new GenericContainer<>(
-            DockerImageName.parse("ubuntu/squid:6.1-23.10_edge"))
+            DockerImageName.parse("ubuntu/squid:6.6-24.04_edge"))
                     .withNetwork(DEFAULT_CONTAINER_NETWORK)
                     .withExposedPorts(8080)
                     .withFileSystemBind(getResource("keycloak_forward_proxy.conf").getPath(), "/etc/squid/squid.conf",
                             BindMode.READ_ONLY);
 
     @Container
     public static GenericContainer<?> forwardProxyBasicAuth = new GenericContainer<>(
-            DockerImageName.parse("ubuntu/squid:6.1-23.10_edge"))
+            DockerImageName.parse("ubuntu/squid:6.6-24.04_edge"))
                     .withNetwork(DEFAULT_CONTAINER_NETWORK)
                     .withExposedPorts(8080)
                     .withFileSystemBind(getResource("keycloak_forward_proxy_basic_auth.conf").getPath(),

diff --git a/.../java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientIT.java b/.../java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientIT.java
@@ -53,7 +53,7 @@ public class StoreClientIT {
     private static final Network DEFAULT_CONTAINER_NETWORK = Network.newNetwork();
 
     @Container
-    public GenericContainer<?> fhirServer = new GenericContainer<>(DockerImageName.parse("samply/blaze:0.27"))
+    public GenericContainer<?> fhirServer = new GenericContainer<>(DockerImageName.parse("samply/blaze:0.30"))
             .withExposedPorts(8080)
             .withNetwork(DEFAULT_CONTAINER_NETWORK)
             .withNetworkAliases("fhir-server")
@@ -201,7 +201,7 @@ public void testRequestToReverseProxyWithClientCert() throws KeyStoreException,
         var serverCertChain = getResource("../certs/server_cert_chain.pem");
         var serverCertKey = getResource("../certs/server_cert_key.pem");
 
-        NginxContainer<?> nginx = new NginxContainer<>("nginx:1.25.1")
+        NginxContainer<?> nginx = new NginxContainer<>("nginx:1.27.1")
                 .withExposedPorts(80)
                 .withFileSystemBind(nginxConf.getPath(), "/etc/nginx/nginx.conf", READ_ONLY)
                 .withFileSystemBind(staticFhirMetadata.getPath(), "/static/fhir_metadata.json", READ_ONLY)
@@ -249,7 +249,7 @@ public void testRequestToReverseProxyWithCredentials() {
         var indexFile = getResource("index.html");
         var passwordFile = getResource(".htpasswd");
 
-        NginxContainer<?> nginx = new NginxContainer<>("nginx:1.25.1")
+        NginxContainer<?> nginx = new NginxContainer<>("nginx:1.27.1")
                 .withExposedPorts(80)
                 .withFileSystemBind(nginxConf.getPath(), "/etc/nginx/nginx.conf", READ_ONLY)
                 .withFileSystemBind(staticFhirMetadata.getPath(), "/static/fhir_metadata.json", READ_ONLY)
@@ -282,7 +282,7 @@ public void testRequestWithForwardProxy() {
         var nginxConf = this.getClass().getResource("nginx.conf");
         var forwardProxyConfigTemplate = getResource("forward_proxy.conf.template");
 
-        NginxContainer<?> nginx = new NginxContainer<>("nginx:1.25.1")
+        NginxContainer<?> nginx = new NginxContainer<>("nginx:1.27.1")
                 .withExposedPorts(80)
                 .withFileSystemBind(nginxConf.getPath(), "/etc/nginx/nginx.conf", READ_ONLY)
                 .withFileSystemBind(forwardProxyConfigTemplate.getPath(), "/etc/nginx/templates/default.conf.template", READ_ONLY)