Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use docker/setup-docker-action #9625

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Use docker/setup-docker-action #9625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci-rootless.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/moby-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading