From 4d1c719bef001742db8f2d483190f3012bf985d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 16 Dec 2024 10:23:22 -0600 Subject: [PATCH 1/9] Update ubuntu version to 22.04 --- .github/workflows/ci.yml | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7aaef550..d3637d3c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -15,7 +15,6 @@ jobs: - { name: "default", javaVersion: 8 } - { name: "default", javaVersion: 17 } - { name: "default", javaVersion: 21 } - - { name: "Docker 19.03.9", dockerVersion: "v19.03.9", javaVersion: 8 } steps: - uses: actions/checkout@v4 - name: Set up JDK @@ -27,15 +26,34 @@ jobs: id: setup_docker uses: docker/setup-docker-action@v4 with: - version: ${{matrix.dockerVersion}} channel: stable - name: Build with Maven env: DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} run: ./mvnw --no-transfer-progress verify - tcp: + docker19: runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: 8 + distribution: temurin + - name: Configure Docker + id: setup_docker + uses: docker/setup-docker-action@v4 + with: + version: v19.03.9 + channel: stable + - name: Build with Maven + env: + DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} + run: ./mvnw --no-transfer-progress verify + + tcp: + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Set up JDK From b3daaf98581cc11dfb4030267c0b98c6fdebde6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 24 Mar 2025 10:09:30 -0600 Subject: [PATCH 2/9] Add init swarm step --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3637d3c2..8eef6ed67 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,10 @@ jobs: uses: docker/setup-docker-action@v4 with: channel: stable + - name: Init swarm + env: + DOCKER_HOST: ${{steps.setup_docker.outputs.tcp}} + run: docker swarm init - name: Build with Maven env: DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} @@ -67,6 +71,10 @@ jobs: with: channel: stable tcp-port: 2375 + - name: Init swarm + env: + DOCKER_HOST: ${{steps.setup_docker.outputs.tcp}} + run: docker swarm init - name: Build with Maven env: DOCKER_HOST: ${{steps.setup_docker.outputs.tcp}} From c3a1ef303a738924c0ca79ec3dabb4872b452981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 24 Mar 2025 10:30:07 -0600 Subject: [PATCH 3/9] Revert "Add init swarm step" This reverts commit b3daaf98581cc11dfb4030267c0b98c6fdebde6f. --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8eef6ed67..d3637d3c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,10 +27,6 @@ jobs: uses: docker/setup-docker-action@v4 with: channel: stable - - name: Init swarm - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.tcp}} - run: docker swarm init - name: Build with Maven env: DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} @@ -71,10 +67,6 @@ jobs: with: channel: stable tcp-port: 2375 - - name: Init swarm - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.tcp}} - run: docker swarm init - name: Build with Maven env: DOCKER_HOST: ${{steps.setup_docker.outputs.tcp}} From 0b24b6c5206fbab0afcee298330d0735d9cf7ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 24 Mar 2025 10:53:33 -0600 Subject: [PATCH 4/9] Update docker dind --- .../test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java index 87f35161c..9e75cffe3 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java @@ -36,7 +36,7 @@ public abstract class SwarmCmdIT extends CmdIT { private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker"; - private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind"; + private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "26.1.3-dind"; private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker"; From d48cf9496fe318ed9e0cc9e1bc46b8742eb86eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 12 May 2025 17:56:18 -0500 Subject: [PATCH 5/9] Adjust dind image --- .../java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java index 9e75cffe3..36bcab840 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java @@ -20,6 +20,8 @@ import org.junit.experimental.categories.Category; import java.io.IOException; +import java.time.Duration; +import java.util.Arrays; import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -105,6 +107,8 @@ protected DockerClient startDockerInDocker() throws InterruptedException { ExposedPort exposedPort = ExposedPort.tcp(2375); CreateContainerResponse response = hostDockerClient .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG) + .withEntrypoint("dockerd") + .withCmd(Arrays.asList("--host=tcp://0.0.0.0:2375", "--host=unix:///var/run/docker.sock", "--tls=false")) .withHostConfig(newHostConfig() .withNetworkMode(NETWORK_NAME) .withPortBindings(new PortBinding( @@ -125,7 +129,7 @@ protected DockerClient startDockerInDocker() throws InterruptedException { DockerClient dockerClient = initializeDockerClient(binding); - await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> { + await().pollDelay(Duration.ofSeconds(5)).atMost(10, TimeUnit.SECONDS).untilAsserted(() -> { dockerClient.pingCmd().exec(); }); From 32b3a1ab67f641a7eb25719d07d57bcea8303da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 12 May 2025 17:57:18 -0500 Subject: [PATCH 6/9] Update workflows --- .github/workflows/ci.yml | 6 +++--- .github/workflows/release.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3637d3c2..09d6f624d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: @@ -33,7 +33,7 @@ jobs: run: ./mvnw --no-transfer-progress verify docker19: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Set up JDK @@ -53,7 +53,7 @@ jobs: run: ./mvnw --no-transfer-progress verify tcp: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Set up JDK diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1517a1167..3e9f64348 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Set up JDK 8 From 3fdfd88e3cffafe5805d1a64010aee059007e178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 12 May 2025 18:08:30 -0500 Subject: [PATCH 7/9] Drop docker19 --- .github/workflows/ci.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09d6f624d..5d6f8d370 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,26 +32,6 @@ jobs: DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} run: ./mvnw --no-transfer-progress verify - docker19: - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - java-version: 8 - distribution: temurin - - name: Configure Docker - id: setup_docker - uses: docker/setup-docker-action@v4 - with: - version: v19.03.9 - channel: stable - - name: Build with Maven - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - run: ./mvnw --no-transfer-progress verify - tcp: runs-on: ubuntu-24.04 steps: From bff2a02e3f4472dd038727a0a11bd70d936bc49a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 12 May 2025 18:45:05 -0500 Subject: [PATCH 8/9] Add assumption --- .../java/com/github/dockerjava/cmd/CreateContainerCmdIT.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index de9f564e4..35f373ab0 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -34,6 +34,7 @@ import com.github.dockerjava.utils.TestUtils; import net.jcip.annotations.NotThreadSafe; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.SystemUtils; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -959,6 +960,8 @@ public void onNext(Frame item) { @Test public void createContainerWithCgroupParent() throws DockerException { + assumeThat(!SystemUtils.IS_OS_LINUX, is(true)); + CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox") .withHostConfig(newHostConfig() .withCgroupParent("/parent")) From a191382774797d5d71395f3b292857e28904089b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 12 May 2025 19:02:12 -0500 Subject: [PATCH 9/9] Ignore memory swappiness test --- .../java/com/github/dockerjava/cmd/CreateContainerCmdIT.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index 35f373ab0..50623c029 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -36,6 +36,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.SystemUtils; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -421,6 +422,7 @@ public void createContainerWithLink() throws DockerException { } @Test + @Ignore public void createContainerWithMemorySwappiness() throws DockerException { CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withCmd("sleep", "9999")