From 72926a59c4a79ee0a290dc736f36655d94702aec Mon Sep 17 00:00:00 2001 From: Johannes Beck Date: Sat, 23 Mar 2024 09:22:37 +0100 Subject: [PATCH] Update images --- src/main/docker/stomp-test/docker-compose.yml | 8 ++++---- src/test/java/x1/arquillian/Containers.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/docker/stomp-test/docker-compose.yml b/src/main/docker/stomp-test/docker-compose.yml index dbb45a0e..8532f8a7 100644 --- a/src/main/docker/stomp-test/docker-compose.yml +++ b/src/main/docker/stomp-test/docker-compose.yml @@ -1,9 +1,9 @@ version: '3' services: etcd: - image: quay.io/coreos/etcd:v3.5.11 + image: quay.io/coreos/etcd:v3.5.12 container_name: etcd - command: ["etcd", "--listen-client-urls", "http://0.0.0.0:2379,http://0.0.0.0:4001", "--advertise-client-urls", "http://etcd:2379,http://etcd:4001"] + command: ["etcd", "--listen-client-urls", "http://0.0.0.0:2379", "--advertise-client-urls", "http://etcd:2379"] environment: - ETCD_ENABLE_V2=true db: @@ -27,7 +27,7 @@ services: wildfly: image: registry.x1/j7beck/x1-wildfly-jar-stomp-test:1.8.0-SNAPSHOT environment: - - X1_SERVICE_REGISTRY_ETCD=http://etcd:4001 + - X1_SERVICE_REGISTRY_ETCD=http://etcd:2379 - X1_SERVICE_REGISTRY_STAGE=docker - OTEL_COLLECTOR=otel-collector - OTEL_SDK_DISABLED=false @@ -45,7 +45,7 @@ services: - 8080:8080 - 8443:8443 otel-collector: - image: otel/opentelemetry-collector-contrib:0.95.0 + image: otel/opentelemetry-collector-contrib:0.96.0 restart: always command: ["--config=/etc/otel-collector-config.yaml"] volumes: diff --git a/src/test/java/x1/arquillian/Containers.java b/src/test/java/x1/arquillian/Containers.java index 0cf1406b..0bc45bc3 100644 --- a/src/test/java/x1/arquillian/Containers.java +++ b/src/test/java/x1/arquillian/Containers.java @@ -20,7 +20,7 @@ public final class Containers implements ArquillianTestContainers { DockerImageName.parse("registry.x1/j7beck/x1-postgres-stomp-test:1.8")).withNetwork(network) .withNetworkAliases("db"); - private GenericContainer etcd = new GenericContainer<>(DockerImageName.parse("quay.io/coreos/etcd:v3.5.11")) + private GenericContainer etcd = new GenericContainer<>(DockerImageName.parse("quay.io/coreos/etcd:v3.5.12")) .withEnv("ETCD_ENABLE_V2", "true").withNetwork(network).withNetworkAliases("etcd").withCommand("etcd", "--listen-client-urls", "http://0.0.0.0:2379", "--advertise-client-urls", "http://etcd:2379");