Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Update ubuntu version to 24.04 #2376

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.

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

Merged
merged 12 commits into from
May 13, 2025
6 changes: 2 additions & 4 deletions 6 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ on:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
include:
- { 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
Expand All @@ -27,15 +26,14 @@ 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:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up JDK
Expand Down
2 changes: 1 addition & 1 deletion 2 .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
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.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
Expand Down Expand Up @@ -420,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")
Expand Down Expand Up @@ -959,6 +962,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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -36,7 +38,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";

Expand Down Expand Up @@ -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(
Expand All @@ -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();
});

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.