Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<properties>
<!-- Project Versioning Properties -->
<revision>2.0.1</revision>
<revision>3.0.0</revision>
<sha1/> <!-- Doesn't actually need to be a sha1, this is just another version modifier variable -->
<changelist>-SNAPSHOT</changelist>
<next-revision>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion}</next-revision>
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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());
}

Expand Down Expand Up @@ -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;
Expand Down
Loading