Use docker/setup-docker-action (#9625)

testcontainers · Dec 10, 2024 · 16397b4 · 16397b4
1 parent ee885f9
commit 16397b4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git 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
@@ -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