From 2e9805bc0bbe53890a4540f9ba8ebed77309a473 Mon Sep 17 00:00:00 2001 From: Cesar Munoz <56847527+LikeTheSalad@users.noreply.github.com> Date: Tue, 17 Feb 2026 11:24:48 +0100 Subject: [PATCH] build: bump wolfi/chainguard-base from `6b24461` to `a71dfa7` Bump chainguard-base image digest, testcontainers to 1.21.4, and upgrade ES test image from 7.17.2 to 7.17.25 to fix cgroupv2 container startup failures on CI runners. Co-authored-by: Cursor --- Dockerfile.wolfi | 2 +- .../apm/agent/esrestclient/v8_x/Elasticsearch8JavaIT.java | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.wolfi b/Dockerfile.wolfi index cc33998b04..601fd3b66b 100644 --- a/Dockerfile.wolfi +++ b/Dockerfile.wolfi @@ -1,4 +1,4 @@ -FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:6b2446102599dee9d17c472ccdb63b462def06028900fdcbf08d413074f8d131 +FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:a71dfa7c4cb17fb0f6814cda77e0bdf7b66dec9b6725fe61abd29c2263775af7 RUN mkdir /usr/agent ARG JAR_FILE ARG HANDLER_FILE diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-8_x/src/test/java/co/elastic/apm/agent/esrestclient/v8_x/Elasticsearch8JavaIT.java b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-8_x/src/test/java/co/elastic/apm/agent/esrestclient/v8_x/Elasticsearch8JavaIT.java index f891afab0b..255acd9a99 100644 --- a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-8_x/src/test/java/co/elastic/apm/agent/esrestclient/v8_x/Elasticsearch8JavaIT.java +++ b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-8_x/src/test/java/co/elastic/apm/agent/esrestclient/v8_x/Elasticsearch8JavaIT.java @@ -101,7 +101,7 @@ @RunWith(Parameterized.class) public class Elasticsearch8JavaIT extends AbstractEsClientInstrumentationTest { - private static final String ELASTICSEARCH_CONTAINER_VERSION = "docker.elastic.co/elasticsearch/elasticsearch:7.17.2"; + private static final String ELASTICSEARCH_CONTAINER_VERSION = "docker.elastic.co/elasticsearch/elasticsearch:7.17.25"; private static final Logger LOGGER = LoggerFactory.getLogger(Elasticsearch8JavaIT.class); @@ -117,7 +117,7 @@ public Elasticsearch8JavaIT(boolean async) { protected static void startContainer(String image) { container = new ElasticsearchContainer(image) - .withEnv("ES_JAVA_OPTS", "-XX:-UseContainerSupport") + .withEnv("ES_JAVA_OPTS", "-XX:-UseContainerSupport -Xms512m -Xmx512m") .withCreateContainerCmdModifier(TestContainersUtils.withMemoryLimit(4096)); container.start(); } diff --git a/pom.xml b/pom.xml index 7dd82797be..5709a4f1d7 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ 1.17 - 1.21.3 + 1.21.4 2.38.0