Skip to content

Bump wolfi/chainguard-base #4402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LikeTheSalad wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Open

Bump wolfi/chainguard-base #4402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.wolfi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...plugin-8_x/src/test/java/co/elastic/apm/agent/esrestclient/v8_x/Elasticsearch8JavaIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<!-- used both for plugin & annotations dependency -->
<version.animal-sniffer>1.17</version.animal-sniffer>

<version.testcontainers>1.21.3</version.testcontainers>
<version.testcontainers>1.21.4</version.testcontainers>

<!-- latest version compiled for java 11 -->
<version.jsonunit>2.38.0</version.jsonunit>
Expand Down
Loading