From 16397b4582596a738c49a905e03f07c467a21202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?= Date: Tue, 10 Dec 2024 13:52:00 -0500 Subject: [PATCH] Use docker/setup-docker-action (#9625) --- .github/workflows/ci-rootless.yml | 6 +++--- .github/workflows/moby-latest.yml | 16 +++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci-rootless.yml b/.github/workflows/ci-rootless.yml index ba3b26a9e46..e5c9afd1dbc 100644 --- a/.github/workflows/ci-rootless.yml +++ b/.github/workflows/ci-rootless.yml @@ -48,9 +48,9 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup rootless Docker - uses: ScribeMD/rootless-docker@0.2.2 - - name: Remove Docket root socket - run: sudo rm -rf /var/run/docker.sock + uses: docker/setup-docker-action@v4 + with: + rootless: true - name: Setup Gradle Build Action uses: gradle/actions/setup-gradle@v4 - name: Build with Gradle diff --git a/.github/workflows/moby-latest.yml b/.github/workflows/moby-latest.yml index 3ebfce168c6..8a0b7d2fe88 100644 --- a/.github/workflows/moby-latest.yml +++ b/.github/workflows/moby-latest.yml @@ -23,19 +23,21 @@ jobs: - name: Install Stable Docker if: ${{ matrix.install-docker-type == 'STABLE' }} - run: curl https://get.docker.com + uses: docker/setup-docker-action@v4 + with: + channel: stable - name: Install Docker from the TEST channel if: ${{ matrix.install-docker-type == 'ROOTFUL' }} - run: curl https://get.docker.com | CHANNEL=test sh + uses: docker/setup-docker-action@v4 + with: + channel: test - name: Setup rootless Docker if: ${{ matrix.install-docker-type == 'ROOTLESS' }} - uses: ScribeMD/rootless-docker@6bd157a512c2fafa4e0243a8aa87d964eb890886 # v0.2.2 - - - name: Remove Docker root socket - if: ${{ matrix.install-docker-type == 'ROOTLESS' }} - run: sudo rm -rf /var/run/docker.sock + uses: docker/setup-docker-action@v4 + with: + rootless: true - name: Check Docker version run: docker version