From 53bc4c745cb583cd4414e34823c974f4f93f1107 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 22 Jul 2024 10:19:07 +0200 Subject: [PATCH 1/3] gha: moby-latest: make "Install Stable Docker" actually install It was only downloading the script, but not executing. While at it, also setting the '-f' (fail-fast), '-s' (silent, unless failing), '-S' (force TLS), and '-L' (follow redirects) options that are recommended when piping the output and executing it. Signed-off-by: Sebastiaan van Stijn --- .github/workflows/moby-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml index 62ce85b1c9b..c23e1fc6469 100644 --- a/.github/workflows/moby-latest.yml +++ b/.github/workflows/moby-latest.yml @@ -20,7 +20,7 @@ jobs: - name: Install Stable Docker if: ${{ matrix.install-docker-type == 'STABLE' }} - run: curl https://get.docker.com + run: curl -fsSL https://get.docker.com | sh - name: Install Docker from the TEST channel if: ${{ matrix.install-docker-type == 'ROOTFUL' }} From 44d7f0b25008e4791aae342ba7d4ab16918a2a28 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 22 Jul 2024 10:25:46 +0200 Subject: [PATCH 2/3] gha: moby-latest: use test.docker.com for test-channel This is just for convenience; the script at test.docker.com is identical to the one at get.docker.com, but uses the test-channel as default. While at it, also setting the '-f' (fail-fast), '-s' (silent, unless failing), '-S' (force TLS), and '-L' (follow redirects) options that are recommended when piping the output and executing it. Signed-off-by: Sebastiaan van Stijn --- .github/workflows/moby-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml index c23e1fc6469..c5059b11700 100644 --- a/.github/workflows/moby-latest.yml +++ b/.github/workflows/moby-latest.yml @@ -24,7 +24,7 @@ jobs: - name: Install Docker from the TEST channel if: ${{ matrix.install-docker-type == 'ROOTFUL' }} - run: curl https://get.docker.com | CHANNEL=test sh + run: curl -fsSL https://test.docker.com | sh - name: Setup rootless Docker if: ${{ matrix.install-docker-type == 'ROOTLESS' }} From c266045bce81941f60e19ce0aa96aa161bff4b11 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 29 Jun 2024 09:46:28 +0200 Subject: [PATCH 3/3] gha: test docker-ce 27.1.0 Signed-off-by: Sebastiaan van Stijn --- .github/workflows/ci-rootless.yml | 8 ++++++++ .github/workflows/moby-latest.yml | 12 ++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml index 21ff4f793c6..cdf5a6ca03b 100644 --- a/.github/workflows/ci-rootless.yml +++ b/.github/workflows/ci-rootless.yml @@ -47,6 +47,14 @@ jobs: checks: write steps: - uses: actions/checkout@v4 + - name: Install Latest Docker + run: | + sudo systemctl stop docker.service + sudo apt-get purge docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-ce-rootless-extras docker-buildx-plugin + curl -fsSL https://test.docker.com -o get-docker.sh + sudo REPO_FILE=docker-ce-staging.repo DOWNLOAD_URL=https://download-stage.docker.com sh ./get-docker.sh + - name: Check Docker version + run: docker version - name: Setup rootless Docker uses: ScribeMD/rootless-docker@0.2.2 - name: Remove Docket root socket diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml index c5059b11700..dfec7a88aef 100644 --- a/.github/workflows/moby-latest.yml +++ b/.github/workflows/moby-latest.yml @@ -20,11 +20,19 @@ jobs: - name: Install Stable Docker if: ${{ matrix.install-docker-type == 'STABLE' }} - run: curl -fsSL https://get.docker.com | sh + run: | + sudo systemctl stop docker.service + sudo apt-get purge docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-ce-rootless-extras docker-buildx-plugin + curl -fsSL https://test.docker.com -o get-docker.sh + sudo REPO_FILE=docker-ce-staging.repo DOWNLOAD_URL=https://download-stage.docker.com sh ./get-docker.sh - name: Install Docker from the TEST channel if: ${{ matrix.install-docker-type == 'ROOTFUL' }} - run: curl -fsSL https://test.docker.com | sh + run: | + sudo systemctl stop docker.service + sudo apt-get purge docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-ce-rootless-extras docker-buildx-plugin + curl -fsSL https://test.docker.com -o get-docker.sh + sudo REPO_FILE=docker-ce-staging.repo DOWNLOAD_URL=https://download-stage.docker.com sh ./get-docker.sh - name: Setup rootless Docker if: ${{ matrix.install-docker-type == 'ROOTLESS' }}