From d87075ec2fadc2357bed9d58be235ee2d0d7ff51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Dec 2024 16:19:15 -0600 Subject: [PATCH 01/16] Switch to docker/setup-docker-action --- .ci/get-docker-com.sh | 313 --------------------------------------- .ci/setup_docker.sh | 39 ----- .github/workflows/ci.yml | 8 +- 3 files changed, 5 insertions(+), 355 deletions(-) delete mode 100755 .ci/get-docker-com.sh delete mode 100755 .ci/setup_docker.sh diff --git a/.ci/get-docker-com.sh b/.ci/get-docker-com.sh deleted file mode 100755 index d9c0142a2..000000000 --- a/.ci/get-docker-com.sh +++ /dev/null @@ -1,313 +0,0 @@ -#!/bin/sh -set -e -# -# This script is meant for quick & easy install via: -# 'curl -sSL https://get.docker.com/ | sh' -# or: -# 'wget -qO- https://get.docker.com/ | sh' -# -# For test builds (ie. release candidates): -# 'curl -fsSL https://test.docker.com/ | sh' -# or: -# 'wget -qO- https://test.docker.com/ | sh' -# -# For experimental builds: -# 'curl -fsSL https://experimental.docker.com/ | sh' -# or: -# 'wget -qO- https://experimental.docker.com/ | sh' -# -# Docker Maintainers: -# To update this script on https://get.docker.com, -# use hack/release.sh during a normal release, -# or the following one-liner for script hotfixes: -# aws s3 cp --acl public-read hack/install.sh s3://get.docker.com/index -# - -url="https://get.docker.com/" -apt_url="https://apt.dockerproject.org" -yum_url="https://yum.dockerproject.org" -gpg_fingerprint="58118E89F3A912897C070ADBF76221572C52609D" - -key_servers=" -ha.pool.sks-keyservers.net -pgp.mit.edu -keyserver.ubuntu.com -" - -command_exists() { - command -v "$@" > /dev/null 2>&1 -} - -semverParse() { - major="${1%%.*}" - minor="${1#$major.}" - minor="${minor%%.*}" - patch="${1#$major.$minor.}" - patch="${patch%%[-.]*}" -} - -do_install() { - case "$(uname -m)" in - *64) - ;; - *) - cat >&2 <<-'EOF' - Error: you are not using a 64bit platform. - Docker currently only supports 64bit platforms. - EOF - exit 1 - ;; - esac - - user="$(id -un 2>/dev/null || true)" - - sh_c='sh -c' - if [ "$user" != 'root' ]; then - if command_exists sudo; then - sh_c='sudo -E sh -c' - elif command_exists su; then - sh_c='su -c' - else - cat >&2 <<-'EOF' - Error: this installer needs the ability to run commands as root. - We are unable to find either "sudo" or "su" available to make this happen. - EOF - exit 1 - fi - fi - - curl='' - if command_exists curl; then - curl='curl -sSL' - elif command_exists wget; then - curl='wget -qO-' - elif command_exists busybox && busybox --list-modules | grep -q wget; then - curl='busybox wget -qO-' - fi - - # check to see which repo they are trying to install from - if [ -z "$repo" ]; then - repo='main' - if [ "https://test.docker.com/" = "$url" ]; then - repo='testing' - elif [ "https://experimental.docker.com/" = "$url" ]; then - repo='experimental' - fi - fi - - # perform some very rudimentary platform detection - lsb_dist='' - dist_version='' - if command_exists lsb_release; then - lsb_dist="$(lsb_release -si)" - fi - if [ -z "$lsb_dist" ] && [ -r /etc/lsb-release ]; then - lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")" - fi - if [ -z "$lsb_dist" ] && [ -r /etc/debian_version ]; then - lsb_dist='debian' - fi - if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then - lsb_dist='fedora' - fi - if [ -z "$lsb_dist" ] && [ -r /etc/oracle-release ]; then - lsb_dist='oracleserver' - fi - if [ -z "$lsb_dist" ]; then - if [ -r /etc/centos-release ] || [ -r /etc/redhat-release ]; then - lsb_dist='centos' - fi - fi - if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then - lsb_dist="$(. /etc/os-release && echo "$ID")" - fi - - lsb_dist="$(echo "$lsb_dist" | tr '[:upper:]' '[:lower:]')" - - case "$lsb_dist" in - - ubuntu) - if command_exists lsb_release; then - dist_version="$(lsb_release --codename | cut -f2)" - fi - if [ -z "$dist_version" ] && [ -r /etc/lsb-release ]; then - dist_version="$(. /etc/lsb-release && echo "$DISTRIB_CODENAME")" - fi - ;; - - debian) - dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')" - case "$dist_version" in - 8) - dist_version="jessie" - ;; - 7) - dist_version="wheezy" - ;; - esac - ;; - - oracleserver) - # need to switch lsb_dist to match yum repo URL - lsb_dist="oraclelinux" - dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')" - ;; - - fedora|centos) - dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')" - ;; - - *) - if command_exists lsb_release; then - dist_version="$(lsb_release --codename | cut -f2)" - fi - if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then - dist_version="$(. /etc/os-release && echo "$VERSION_ID")" - fi - ;; - - - esac - - - # Run setup for each distro accordingly - case "$lsb_dist" in - ubuntu|debian) - export DEBIAN_FRONTEND=noninteractive - - did_apt_get_update= - apt_get_update() { - if [ -z "$did_apt_get_update" ]; then - ( set -x; $sh_c 'sleep 3; apt-get update' ) - did_apt_get_update=1 - fi - } - - # aufs is preferred over devicemapper; try to ensure the driver is available. - if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then - if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then - kern_extras="linux-image-extra-$(uname -r) linux-image-extra-virtual" - - apt_get_update - ( set -x; $sh_c 'sleep 3; apt-get install -y -q '"$kern_extras" ) || true - - if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then - echo >&2 'Warning: tried to install '"$kern_extras"' (for AUFS)' - echo >&2 ' but we still have no AUFS. Docker may not work. Proceeding anyways!' - ( set -x; sleep 10 ) - fi - else - echo >&2 'Warning: current kernel is not supported by the linux-image-extra-virtual' - echo >&2 ' package. We have no AUFS support. Consider installing the packages' - echo >&2 ' linux-image-virtual kernel and linux-image-extra-virtual for AUFS support.' - ( set -x; sleep 10 ) - fi - fi - - # install apparmor utils if they're missing and apparmor is enabled in the kernel - # otherwise Docker will fail to start - if [ "$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = 'Y' ]; then - if command -v apparmor_parser >/dev/null 2>&1; then - echo 'apparmor is enabled in the kernel and apparmor utils were already installed' - else - echo 'apparmor is enabled in the kernel, but apparmor_parser missing' - apt_get_update - ( set -x; $sh_c 'sleep 3; apt-get install -y -q apparmor' ) - fi - fi - - if [ ! -e /usr/lib/apt/methods/https ]; then - apt_get_update - ( set -x; $sh_c 'sleep 3; apt-get install -y -q apt-transport-https ca-certificates' ) - fi - if [ -z "$curl" ]; then - apt_get_update - ( set -x; $sh_c 'sleep 3; apt-get install -y -q curl ca-certificates' ) - curl='curl -sSL' - fi - ( - set -x - for key_server in $key_servers ; do - $sh_c "apt-key adv --keyserver hkp://${key_server}:80 --recv-keys ${gpg_fingerprint}" && break - done - $sh_c "apt-key adv -k ${gpg_fingerprint} >/dev/null" - $sh_c "mkdir -p /etc/apt/sources.list.d" - $sh_c "echo deb [arch=$(dpkg --print-architecture)] ${apt_url}/repo ${lsb_dist}-${dist_version} ${repo} > /etc/apt/sources.list.d/docker.list" - $sh_c 'sleep 3; apt-get update' - if [ -z "$DOCKER_VERSION" ]; then - $sh_c 'apt-get -o Dpkg::Options::="--force-confnew" install -y -q docker-engine' - else - $sh_c "apt-get -o Dpkg::Options::=\"--force-confnew\" install -y -q docker-engine=$DOCKER_VERSION" - fi - ) - exit 0 - ;; - - fedora|centos|oraclelinux) - $sh_c "cat >/etc/yum.repos.d/docker-${repo}.repo" <<-EOF - [docker-${repo}-repo] - name=Docker ${repo} Repository - baseurl=${yum_url}/repo/${repo}/${lsb_dist}/${dist_version} - enabled=1 - gpgcheck=1 - gpgkey=${yum_url}/gpg - EOF - if [ "$lsb_dist" = "fedora" ] && [ "$dist_version" -ge "22" ]; then - ( - set -x - $sh_c 'sleep 3; dnf -y -q install docker-engine' - ) - else - ( - set -x - $sh_c 'sleep 3; yum -y -q install docker-engine' - ) - fi - exit 0 - ;; - gentoo) - if [ "$url" = "https://test.docker.com/" ]; then - # intentionally mixed spaces and tabs here -- tabs are stripped by "<<-'EOF'", spaces are kept in the output - cat >&2 <<-'EOF' - - You appear to be trying to install the latest nightly build in Gentoo.' - The portage tree should contain the latest stable release of Docker, but' - if you want something more recent, you can always use the live ebuild' - provided in the "docker" overlay available via layman. For more' - instructions, please see the following URL:' - - https://github.com/tianon/docker-overlay#using-this-overlay' - - After adding the "docker" overlay, you should be able to:' - - emerge -av =app-emulation/docker-9999' - - EOF - exit 1 - fi - - ( - set -x - $sh_c 'sleep 3; emerge app-emulation/docker' - ) - exit 0 - ;; - esac - - # intentionally mixed spaces and tabs here -- tabs are stripped by "<<-'EOF'", spaces are kept in the output - cat >&2 <<-'EOF' - - Either your platform is not easily detectable, is not supported by this - installer script (yet - PRs welcome! [hack/install.sh]), or does not yet have - a package for Docker. Please visit the following URL for more detailed - installation instructions: - - https://docs.docker.com/engine/installation/ - - EOF - exit 1 -} - -# wrapped up in a function so that we have some protection against only getting -# half the file during "curl | sh" -do_install diff --git a/.ci/setup_docker.sh b/.ci/setup_docker.sh deleted file mode 100755 index df9cf205a..000000000 --- a/.ci/setup_docker.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -set -exu - -DOCKER_VERSION="${DOCKER_VERSION:-}" -DOCKER_HOST="${DOCKER_HOST:-}" - -if [[ -n $DOCKER_VERSION ]]; then - sudo -E apt-get -q -y --purge remove docker-engine docker-ce - - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update - sudo apt-cache madison docker-ce - sudo apt-get install "docker-ce=$DOCKER_VERSION" -fi - -if [[ -n $DOCKER_HOST ]]; then - sudo mkdir -p /etc/systemd/system/docker.service.d/ - - echo " -[Service] -ExecStart= -ExecStart=/usr/bin/dockerd -H $DOCKER_HOST -H unix:///var/run/docker.sock - " | sudo tee -a /etc/systemd/system/docker.service.d/override.conf - - sudo systemctl daemon-reload - sudo service docker restart || sudo journalctl -xe - sudo service docker status -fi - -while (! docker ps ); do - echo "Waiting for Docker to launch..." - sleep 1 -done -docker version -docker info - -docker run --rm hello-world diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03cc0034d..c3955afb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - { name: "default", javaVersion: 17 } - { name: "default", javaVersion: 21 } - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } - - { name: "Docker 19.03.9", dockerVersion: "5:19.03.9~3-0~ubuntu-focal", javaVersion: 8 } + - { name: "Docker 19.03.9", dockerVersion: "v19.03.9", javaVersion: 8 } steps: - uses: actions/checkout@v4 @@ -26,10 +26,12 @@ jobs: java-version: ${{matrix.javaVersion}} distribution: temurin - name: Configure Docker + uses: docker/setup-docker-action@v4 + with: + version: ${{matrix.dockerVersion}} + channel: stable env: - DOCKER_VERSION: ${{matrix.dockerVersion}} DOCKER_HOST: ${{matrix.dockerHost}} - run: .ci/setup_docker.sh - name: Build with Maven env: DOCKER_HOST: ${{matrix.dockerHost}} From 87b38d1212d7d50a89720f2263891e7d4d23a67d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Dec 2024 16:29:32 -0600 Subject: [PATCH 02/16] Remove docker host env var from setup docker --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3955afb4..ec90b5850 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,8 +30,6 @@ jobs: with: version: ${{matrix.dockerVersion}} channel: stable - env: - DOCKER_HOST: ${{matrix.dockerHost}} - name: Build with Maven env: DOCKER_HOST: ${{matrix.dockerHost}} From ebdeb08d6bf59e9974ffdb0f6389bfd8f72254ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Dec 2024 16:38:40 -0600 Subject: [PATCH 03/16] Use docker 26.1.0 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec90b5850..0c61e8344 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,10 +12,10 @@ jobs: fail-fast: false matrix: include: - - { name: "default", javaVersion: 8 } - - { name: "default", javaVersion: 17 } - - { name: "default", javaVersion: 21 } - - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } + - { name: "default", dockerVersion: "v26.1.0", javaVersion: 8 } + - { name: "default", dockerVersion: "v26.1.0", javaVersion: 17 } + - { name: "default", dockerVersion: "v26.1.0", javaVersion: 21 } + - { name: "over TCP", dockerVersion: "v26.1.0", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } - { name: "Docker 19.03.9", dockerVersion: "v19.03.9", javaVersion: 8 } steps: From 878ac84f2fb58c364c833938edd31a6aeee86200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Dec 2024 16:46:52 -0600 Subject: [PATCH 04/16] Use docker 24.0.9 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c61e8344..0bff3d7be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,10 +12,10 @@ jobs: fail-fast: false matrix: include: - - { name: "default", dockerVersion: "v26.1.0", javaVersion: 8 } - - { name: "default", dockerVersion: "v26.1.0", javaVersion: 17 } - - { name: "default", dockerVersion: "v26.1.0", javaVersion: 21 } - - { name: "over TCP", dockerVersion: "v26.1.0", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } + - { name: "default", dockerVersion: "v24.0.9", javaVersion: 8 } + - { name: "default", dockerVersion: "v24.0.9", javaVersion: 17 } + - { name: "default", dockerVersion: "v24.0.9", javaVersion: 21 } + - { name: "over TCP", dockerVersion: "v24.0.9", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } - { name: "Docker 19.03.9", dockerVersion: "v19.03.9", javaVersion: 8 } steps: From 8bb18458d4952d01bc55a363912fda7821704536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Dec 2024 16:56:23 -0600 Subject: [PATCH 05/16] Fix version busybox:1.36.0 --- .../src/test/java/com/github/dockerjava/core/DockerRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java index 3fc5c40d7..5a5601404 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java @@ -27,7 +27,7 @@ */ public class DockerRule extends ExternalResource { public static final Logger LOG = LoggerFactory.getLogger(DockerRule.class); - public static final String DEFAULT_IMAGE = "busybox:latest"; + public static final String DEFAULT_IMAGE = "busybox:1.36.0"; private DockerClient dockerClient; From 0a47615492fc4aa90394d307e2f8a785378b5e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Dec 2024 17:04:47 -0600 Subject: [PATCH 06/16] Use docker 26.1.4 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bff3d7be..acb069611 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,10 +12,10 @@ jobs: fail-fast: false matrix: include: - - { name: "default", dockerVersion: "v24.0.9", javaVersion: 8 } - - { name: "default", dockerVersion: "v24.0.9", javaVersion: 17 } - - { name: "default", dockerVersion: "v24.0.9", javaVersion: 21 } - - { name: "over TCP", dockerVersion: "v24.0.9", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } + - { name: "default", dockerVersion: "v26.1.4", javaVersion: 8 } + - { name: "default", dockerVersion: "v26.1.4", javaVersion: 17 } + - { name: "default", dockerVersion: "v26.1.4", javaVersion: 21 } + - { name: "over TCP", dockerVersion: "v26.1.4", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } - { name: "Docker 19.03.9", dockerVersion: "v19.03.9", javaVersion: 8 } steps: From 965bc14ad6cd60892e2829c25b6fa9b3b7863059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Dec 2024 17:05:58 -0600 Subject: [PATCH 07/16] Revert "Fix version busybox:1.36.0" This reverts commit 8bb18458d4952d01bc55a363912fda7821704536. --- .../src/test/java/com/github/dockerjava/core/DockerRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java index 5a5601404..3fc5c40d7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java @@ -27,7 +27,7 @@ */ public class DockerRule extends ExternalResource { public static final Logger LOG = LoggerFactory.getLogger(DockerRule.class); - public static final String DEFAULT_IMAGE = "busybox:1.36.0"; + public static final String DEFAULT_IMAGE = "busybox:latest"; private DockerClient dockerClient; From ae73e049564e2803795e4084153ddd11cf8eec20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Dec 2024 17:44:17 -0600 Subject: [PATCH 08/16] Fix restart test --- .../com/github/dockerjava/cmd/RestartContainerCmdImplIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java index ac2415281..bdf309dc2 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java @@ -60,7 +60,7 @@ public void restartContainerWithSignal() throws Exception { .build(); try (DockerClient dockerClient = createDockerClient(dockerClientConfig)) { String expectedUserSignal = "10"; - String initialCommandWithTrap = "trap 'echo \"exit trapped\"' %s; sleep 9999;"; + String initialCommandWithTrap = "trap 'echo \"exit trapped\"' %s; while :; do sleep 1; done"; final String containerId = dockerClient .createContainerCmd(DEFAULT_IMAGE) .withCmd( From c1791d312e4a6f36001f50a9c8b189eba8b0bd31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Dec 2024 17:54:42 -0600 Subject: [PATCH 09/16] Use docker latest --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index acb069611..ec90b5850 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,10 +12,10 @@ jobs: fail-fast: false matrix: include: - - { name: "default", dockerVersion: "v26.1.4", javaVersion: 8 } - - { name: "default", dockerVersion: "v26.1.4", javaVersion: 17 } - - { name: "default", dockerVersion: "v26.1.4", javaVersion: 21 } - - { name: "over TCP", dockerVersion: "v26.1.4", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } + - { name: "default", javaVersion: 8 } + - { name: "default", javaVersion: 17 } + - { name: "default", javaVersion: 21 } + - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } - { name: "Docker 19.03.9", dockerVersion: "v19.03.9", javaVersion: 8 } steps: From 9310b5d0048a476159374b27dac7c8c0696c72e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Wed, 11 Dec 2024 10:57:43 -0600 Subject: [PATCH 10/16] Add host tcp to daemon config --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec90b5850..7de7e2c07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,10 @@ jobs: with: version: ${{matrix.dockerVersion}} channel: stable + daemon-config: | + { + "hosts": ["unix:///var/run/docker.sock", "tcp://127.0.0.1:2375"] + } - name: Build with Maven env: DOCKER_HOST: ${{matrix.dockerHost}} From 56e4eff9c1de5e793d9acff7c7b11edb1aab1bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Fri, 13 Dec 2024 10:51:12 -0600 Subject: [PATCH 11/16] Test tcp --- .github/workflows/ci.yml | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7de7e2c07..2f151fb94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,7 @@ jobs: - { name: "default", javaVersion: 8 } - { name: "default", javaVersion: 17 } - { name: "default", javaVersion: 21 } - - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 } - { name: "Docker 19.03.9", dockerVersion: "v19.03.9", javaVersion: 8 } - steps: - uses: actions/checkout@v4 - name: Set up JDK @@ -30,13 +28,29 @@ jobs: with: version: ${{matrix.dockerVersion}} channel: stable - daemon-config: | - { - "hosts": ["unix:///var/run/docker.sock", "tcp://127.0.0.1:2375"] - } - name: Build with Maven env: DOCKER_HOST: ${{matrix.dockerHost}} run: | [[ -z "$DOCKER_HOST" ]] && unset DOCKER_HOST ./mvnw --no-transfer-progress verify + + tcp: + 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: crazy-max/docker-setup-docker-action@expose-tcp-input + with: + channel: stable + tcp-port: 2375 + - name: Build with Maven + env: + DOCKER_HOST: ${{steps.setup_docker.outputs.tcp}} + run: ./mvnw --no-transfer-progress verify From aae17cf89adc1402503cf9688c24255c286ca8cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Fri, 13 Dec 2024 11:51:54 -0600 Subject: [PATCH 12/16] Use setup-docker-action output for socket --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f151fb94..b179f7eee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,16 +24,15 @@ jobs: java-version: ${{matrix.javaVersion}} distribution: temurin - name: Configure Docker + id: setup_docker uses: docker/setup-docker-action@v4 with: version: ${{matrix.dockerVersion}} channel: stable - name: Build with Maven env: - DOCKER_HOST: ${{matrix.dockerHost}} - run: | - [[ -z "$DOCKER_HOST" ]] && unset DOCKER_HOST - ./mvnw --no-transfer-progress verify + DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} + run: ./mvnw --no-transfer-progress verify tcp: runs-on: ubuntu-20.04 From a09bfa210cae4ab12fcea78586df66eaf5f5034f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 16 Dec 2024 09:13:33 -0600 Subject: [PATCH 13/16] Switch to docker/setup-docker-action --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b179f7eee..b7aaef550 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: distribution: temurin - name: Configure Docker id: setup_docker - uses: crazy-max/docker-setup-docker-action@expose-tcp-input + uses: docker/setup-docker-action@v4 with: channel: stable tcp-port: 2375 From ceafa27ccedf856ec028491270dc9555a1f73c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 16 Dec 2024 09:42:46 -0600 Subject: [PATCH 14/16] Add workflow to test docker context --- .github/workflows/ci.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7aaef550..ab9a772ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,3 +53,23 @@ jobs: env: DOCKER_HOST: ${{steps.setup_docker.outputs.tcp}} run: ./mvnw --no-transfer-progress verify + + context: + 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 + uses: docker/setup-docker-action@v4 + with: + channel: stable + - name: Build with Maven + env: + DOCKER_CONTEXT: setup-docker-action + run: | + [[ -z "$DOCKER_HOST" ]] && unset DOCKER_HOST + ./mvnw --no-transfer-progress verify From 4d812d7d50c527a28cba43ffdd45332322079d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 16 Dec 2024 10:07:35 -0600 Subject: [PATCH 15/16] Remove docker action --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab9a772ba..12c272c01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,10 +63,6 @@ jobs: with: java-version: 8 distribution: temurin - - name: Configure Docker - uses: docker/setup-docker-action@v4 - with: - channel: stable - name: Build with Maven env: DOCKER_CONTEXT: setup-docker-action From 41bc31bbec461e30e90c8302d8cf67d5c0003cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 16 Dec 2024 10:13:36 -0600 Subject: [PATCH 16/16] Remove context --- .github/workflows/ci.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12c272c01..b7aaef550 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,19 +53,3 @@ jobs: env: DOCKER_HOST: ${{steps.setup_docker.outputs.tcp}} run: ./mvnw --no-transfer-progress verify - - context: - 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: Build with Maven - env: - DOCKER_CONTEXT: setup-docker-action - run: | - [[ -z "$DOCKER_HOST" ]] && unset DOCKER_HOST - ./mvnw --no-transfer-progress verify