Skip to content

Commit 16397b4

Browse files
authored
Use docker/setup-docker-action (#9625)
1 parent ee885f9 commit 16397b4

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

.github/workflows/ci-rootless.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ jobs:
4848
steps:
4949
- uses: actions/checkout@v4
5050
- name: Setup rootless Docker
51-
uses: ScribeMD/rootless-docker@0.2.2
52-
- name: Remove Docket root socket
53-
run: sudo rm -rf /var/run/docker.sock
51+
uses: docker/setup-docker-action@v4
52+
with:
53+
rootless: true
5454
- name: Setup Gradle Build Action
5555
uses: gradle/actions/setup-gradle@v4
5656
- name: Build with Gradle

.github/workflows/moby-latest.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,21 @@ jobs:
2323

2424
- name: Install Stable Docker
2525
if: ${{ matrix.install-docker-type == 'STABLE' }}
26-
run: curl https://get.docker.com
26+
uses: docker/setup-docker-action@v4
27+
with:
28+
channel: stable
2729

2830
- name: Install Docker from the TEST channel
2931
if: ${{ matrix.install-docker-type == 'ROOTFUL' }}
30-
run: curl https://get.docker.com | CHANNEL=test sh
32+
uses: docker/setup-docker-action@v4
33+
with:
34+
channel: test
3135

3236
- name: Setup rootless Docker
3337
if: ${{ matrix.install-docker-type == 'ROOTLESS' }}
34-
uses: ScribeMD/rootless-docker@6bd157a512c2fafa4e0243a8aa87d964eb890886 # v0.2.2
35-
36-
- name: Remove Docker root socket
37-
if: ${{ matrix.install-docker-type == 'ROOTLESS' }}
38-
run: sudo rm -rf /var/run/docker.sock
38+
uses: docker/setup-docker-action@v4
39+
with:
40+
rootless: true
3941

4042
- name: Check Docker version
4143
run: docker version

0 commit comments

Comments
 (0)