diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index b78edda..3a822c3 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -27,7 +27,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-build-${{matrix.type}}-${{ hashFiles('**/pom.xml') }} diff --git a/pom.xml b/pom.xml index f8473c2..802338d 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ - 2.0.1 + 3.0.0 -SNAPSHOT ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion} diff --git a/testcontainer/src/main/java/com/solace/test/integration/testcontainer/PubSubPlusContainer.java b/testcontainer/src/main/java/com/solace/test/integration/testcontainer/PubSubPlusContainer.java index 69790d3..2c135b1 100644 --- a/testcontainer/src/main/java/com/solace/test/integration/testcontainer/PubSubPlusContainer.java +++ b/testcontainer/src/main/java/com/solace/test/integration/testcontainer/PubSubPlusContainer.java @@ -1,5 +1,7 @@ package com.solace.test.integration.testcontainer; +import com.github.dockerjava.api.model.Ulimit; +import java.time.Duration; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.utility.DockerImageName; @@ -33,6 +35,8 @@ public PubSubPlusContainer(DockerImageName dockerImageName) { .withAdminPassword(DEFAULT_ADMIN_PASSWORD) .withMaxConnectionCount(DEFAULT_MAX_CONNECTION_COUNT) .withSharedMemorySize(DEFAULT_SHM_SIZE) + .withCreateContainerCmdModifier(cmd -> cmd.getHostConfig() + .withUlimits(new Ulimit[] {new Ulimit("nofile", 2448, 1048576L)})) .waitingFor(Wait.forListeningPort()); } @@ -79,7 +83,8 @@ public enum Port { SEMP(8080, "http"), SMF(55555, "tcp"), SMF_WEB(8008, "ws"), - SSH(2222, null); + SSH(2222, null), + HEALTH(5550, "http"); private final int containerPort; private final String protocol;