Skip to content

Commit 8b40dc3

Browse files
eddumelendezeddumelendez
authored
Merge branch 'main' into main
2 parents a4068db + 1f1e60d commit 8b40dc3

4 files changed

Lines changed: 14 additions & 7 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-24.04
1111
strategy:
1212
fail-fast: false
1313
matrix:
1414
include:
1515
- { name: "default", javaVersion: 8 }
1616
- { name: "default", javaVersion: 17 }
1717
- { name: "default", javaVersion: 21 }
18-
- { name: "Docker 19.03.9", dockerVersion: "v19.03.9", javaVersion: 8 }
1918
steps:
2019
- uses: actions/checkout@v4
2120
- name: Set up JDK
@@ -27,15 +26,14 @@ jobs:
2726
id: setup_docker
2827
uses: docker/setup-docker-action@v4
2928
with:
30-
version: ${{matrix.dockerVersion}}
3129
channel: stable
3230
- name: Build with Maven
3331
env:
3432
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
3533
run: ./mvnw --no-transfer-progress verify
3634

3735
tcp:
38-
runs-on: ubuntu-20.04
36+
runs-on: ubuntu-24.04
3937
steps:
4038
- uses: actions/checkout@v4
4139
- name: Set up JDK

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Set up JDK 8

‎docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
import com.github.dockerjava.utils.TestUtils;
3535
import net.jcip.annotations.NotThreadSafe;
3636
import org.apache.commons.io.FileUtils;
37+
import org.apache.commons.lang3.SystemUtils;
3738
import org.junit.ClassRule;
39+
import org.junit.Ignore;
3840
import org.junit.Rule;
3941
import org.junit.Test;
4042
import org.junit.rules.ExpectedException;
@@ -420,6 +422,7 @@ public void createContainerWithLink() throws DockerException {
420422
}
421423

422424
@Test
425+
@Ignore
423426
public void createContainerWithMemorySwappiness() throws DockerException {
424427
CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
425428
.withCmd("sleep", "9999")
@@ -959,6 +962,8 @@ public void onNext(Frame item) {
959962

960963
@Test
961964
public void createContainerWithCgroupParent() throws DockerException {
965+
assumeThat(!SystemUtils.IS_OS_LINUX, is(true));
966+
962967
CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
963968
.withHostConfig(newHostConfig()
964969
.withCgroupParent("/parent"))

‎docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import org.junit.experimental.categories.Category;
2121

2222
import java.io.IOException;
23+
import java.time.Duration;
24+
import java.util.Arrays;
2325
import java.util.HashSet;
2426
import java.util.Set;
2527
import java.util.concurrent.TimeUnit;
@@ -36,7 +38,7 @@ public abstract class SwarmCmdIT extends CmdIT {
3638

3739
private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker";
3840

39-
private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind";
41+
private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "26.1.3-dind";
4042

4143
private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker";
4244

@@ -105,6 +107,8 @@ protected DockerClient startDockerInDocker() throws InterruptedException {
105107
ExposedPort exposedPort = ExposedPort.tcp(2375);
106108
CreateContainerResponse response = hostDockerClient
107109
.createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG)
110+
.withEntrypoint("dockerd")
111+
.withCmd(Arrays.asList("--host=tcp://0.0.0.0:2375", "--host=unix:///var/run/docker.sock", "--tls=false"))
108112
.withHostConfig(newHostConfig()
109113
.withNetworkMode(NETWORK_NAME)
110114
.withPortBindings(new PortBinding(
@@ -125,7 +129,7 @@ protected DockerClient startDockerInDocker() throws InterruptedException {
125129

126130
DockerClient dockerClient = initializeDockerClient(binding);
127131

128-
await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
132+
await().pollDelay(Duration.ofSeconds(5)).atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
129133
dockerClient.pingCmd().exec();
130134
});
131135

0 commit comments

Comments
 (0)