Skip to content

Commit 68ffb90

Browse files
authored
feat(ci): Enable master moby with rootless (#2880)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
1 parent 0dfebc8 commit 68ffb90

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

.github/workflows/docker-moby-latest.yml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ jobs:
1111
matrix:
1212
rootless-docker: [true, false]
1313
containerd-integration: [true, false]
14-
# ghaction-setup-docker doesn't work with rootless yet
15-
exclude:
16-
- rootless-docker: true
17-
containerd-integration: true
1814

1915
name: "Core tests using latest moby/moby"
2016
runs-on: 'ubuntu-latest'
@@ -25,14 +21,6 @@ jobs:
2521
echo "docker_install_type=${{ matrix.rootless-docker == true && 'Rootless' || 'Rootful' }}" >> "$GITHUB_ENV"
2622
echo "containerd_integration=${{ matrix.containerd-integration == true && 'containerd' || '' }}" >> "$GITHUB_ENV"
2723
28-
- name: Setup rootless Docker
29-
if: ${{ matrix.rootless-docker }}
30-
uses: ScribeMD/rootless-docker@6bd157a512c2fafa4e0243a8aa87d964eb890886 # v0.2.2
31-
32-
- name: Remove Docker root socket
33-
if: ${{ matrix.rootless-docker }}
34-
run: sudo rm -rf /var/run/docker.sock
35-
3624
- name: Check out code into the Go module directory
3725
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
3826

@@ -50,22 +38,17 @@ jobs:
5038
run: go mod tidy
5139

5240
- name: Install Nightly Docker
53-
# rootless not supported with ghaction-setup-docker yet
54-
if: ${{ matrix.rootless-docker == false }}
5541
uses: crazy-max/ghaction-setup-docker@master
5642
with:
43+
rootless: ${{ matrix.rootless-docker }}
44+
version: type=image,tag=master
5745
daemon-config: |
5846
{
5947
"debug": true,
6048
"features": {
6149
"containerd-snapshotter": ${{ matrix.containerd-integration }}
6250
}
6351
}
64-
version: type=image,tag=master
65-
66-
- name: Install test Docker
67-
if: ${{ matrix.rootless-docker }}
68-
run: curl https://get.docker.com | CHANNEL=test sh
6952
7053
- name: go test
7154
timeout-minutes: 30

0 commit comments

Comments
 (0)