From 92b37d793df5db6ee88775d16be9487053bd643f Mon Sep 17 00:00:00 2001 From: nscuro Date: Mon, 17 Feb 2025 17:14:45 +0100 Subject: [PATCH 1/3] Bump Redpanda container image to v24.2.17 Signed-off-by: nscuro --- docker-compose.yml | 4 ++-- e2e/src/test/java/org/dependencytrack/e2e/AbstractE2ET.java | 2 +- mirror-service/src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 93a31ef60..93be0c236 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -212,7 +212,7 @@ services: restart: unless-stopped redpanda: - image: docker.redpanda.com/redpandadata/redpanda:v24.2.12 + image: docker.redpanda.com/redpandadata/redpanda:v24.2.17 container_name: dt-redpanda command: - redpanda @@ -249,7 +249,7 @@ services: restart: unless-stopped redpanda-init: - image: docker.redpanda.com/redpandadata/redpanda:v24.2.12 + image: docker.redpanda.com/redpandadata/redpanda:v24.2.17 container_name: dt-redpanda-init depends_on: redpanda: diff --git a/e2e/src/test/java/org/dependencytrack/e2e/AbstractE2ET.java b/e2e/src/test/java/org/dependencytrack/e2e/AbstractE2ET.java index fd2b0e0e4..473b9700c 100644 --- a/e2e/src/test/java/org/dependencytrack/e2e/AbstractE2ET.java +++ b/e2e/src/test/java/org/dependencytrack/e2e/AbstractE2ET.java @@ -55,7 +55,7 @@ public class AbstractE2ET { protected static DockerImageName POSTGRES_IMAGE = DockerImageName.parse("postgres:15-alpine"); - protected static DockerImageName REDPANDA_IMAGE = DockerImageName.parse("docker.redpanda.com/redpandadata/redpanda:v24.2.12"); + protected static DockerImageName REDPANDA_IMAGE = DockerImageName.parse("docker.redpanda.com/redpandadata/redpanda:v24.2.17"); protected static DockerImageName API_SERVER_IMAGE = DockerImageName.parse("ghcr.io/dependencytrack/hyades-apiserver") .withTag(Optional.ofNullable(System.getenv("APISERVER_VERSION")).orElse("snapshot")); protected static DockerImageName MIRROR_SERVICE_IMAGE = DockerImageName.parse("ghcr.io/dependencytrack/hyades-mirror-service") diff --git a/mirror-service/src/main/resources/application.properties b/mirror-service/src/main/resources/application.properties index fbe16f3aa..8b4c731de 100644 --- a/mirror-service/src/main/resources/application.properties +++ b/mirror-service/src/main/resources/application.properties @@ -210,7 +210,7 @@ kafka-streams.exception.thresholds.production.interval=PT30M # @category: Kafka # @hidden -quarkus.kafka.devservices.image-name=docker.redpanda.com/redpandadata/redpanda:v24.2.12 +quarkus.kafka.devservices.image-name=docker.redpanda.com/redpandadata/redpanda:v24.2.17 # @category: Kafka # @hidden diff --git a/notification-publisher/src/main/resources/application.properties b/notification-publisher/src/main/resources/application.properties index e86701807..c129222ca 100644 --- a/notification-publisher/src/main/resources/application.properties +++ b/notification-publisher/src/main/resources/application.properties @@ -35,7 +35,7 @@ dt.kafka.topic.prefix= ## Dev Services for Kafka # -quarkus.kafka.devservices.image-name=docker.redpanda.com/redpandadata/redpanda:v24.2.12 +quarkus.kafka.devservices.image-name=docker.redpanda.com/redpandadata/redpanda:v24.2.17 quarkus.kafka.devservices.topic-partitions."dtrack.notification.new-vulnerability"=1 ##quarkus hibernate properties diff --git a/repository-meta-analyzer/src/main/resources/application.properties b/repository-meta-analyzer/src/main/resources/application.properties index f18627ec7..32bac3052 100644 --- a/repository-meta-analyzer/src/main/resources/application.properties +++ b/repository-meta-analyzer/src/main/resources/application.properties @@ -182,7 +182,7 @@ kafka-streams.exception.thresholds.production.interval=PT30M # @category: Kafka # @hidden -quarkus.kafka.devservices.image-name=docker.redpanda.com/redpandadata/redpanda:v24.2.12 +quarkus.kafka.devservices.image-name=docker.redpanda.com/redpandadata/redpanda:v24.2.17 # @category: Kafka # @hidden diff --git a/vulnerability-analyzer/src/main/resources/application.properties b/vulnerability-analyzer/src/main/resources/application.properties index 9e7667ecf..abc165c67 100644 --- a/vulnerability-analyzer/src/main/resources/application.properties +++ b/vulnerability-analyzer/src/main/resources/application.properties @@ -66,7 +66,7 @@ state-store.type=in_memory ## Dev Services for Kafka # -quarkus.kafka.devservices.image-name=docker.redpanda.com/redpandadata/redpanda:v24.2.12 +quarkus.kafka.devservices.image-name=docker.redpanda.com/redpandadata/redpanda:v24.2.17 quarkus.kafka.devservices.topic-partitions."dtrack.vuln-analysis.component"=3 quarkus.kafka.devservices.topic-partitions."dtrack.vuln-analysis.scanner.result"=3 quarkus.kafka.devservices.topic-partitions."dtrack.vuln-analysis.result"=3 From c5e84ee3a050ee9dcdb59b42321481191b66d266 Mon Sep 17 00:00:00 2001 From: nscuro Date: Mon, 17 Feb 2025 17:18:39 +0100 Subject: [PATCH 2/3] Bump Redpanda Console container image to v2.8.2 Signed-off-by: nscuro --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 93be0c236..e2a1f4746 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -273,7 +273,7 @@ services: restart: on-failure redpanda-console: - image: docker.redpanda.com/vectorized/console:v2.7.2 + image: docker.redpanda.com/redpandadata/console:v2.8.2 container_name: dt-redpanda-console entrypoint: "/bin/sh" command: "-c 'echo \"$$CONSOLE_CONFIG_FILE\" > \"$$CONFIG_FILEPATH\"; /app/console'" From c2f054fecec0789b73b480848d9bf96927443068 Mon Sep 17 00:00:00 2001 From: nscuro Date: Mon, 17 Feb 2025 17:19:56 +0100 Subject: [PATCH 3/3] Bump Grafana container image to v11.5.1 Signed-off-by: nscuro --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e2a1f4746..e32eb8447 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -369,7 +369,7 @@ services: restart: unless-stopped grafana: - image: grafana/grafana-oss:11.3.1 + image: grafana/grafana-oss:11.5.1 container_name: dt-grafana depends_on: - prometheus