diff --git a/.github/workflows/docker-moby-latest.yml b/.github/workflows/docker-moby-latest.yml index a5902d1fe3..6381256a9e 100644 --- a/.github/workflows/docker-moby-latest.yml +++ b/.github/workflows/docker-moby-latest.yml @@ -11,10 +11,6 @@ jobs: matrix: rootless-docker: [true, false] containerd-integration: [true, false] - # ghaction-setup-docker doesn't work with rootless yet - exclude: - - rootless-docker: true - containerd-integration: true name: "Core tests using latest moby/moby" runs-on: 'ubuntu-latest' @@ -50,10 +46,10 @@ jobs: run: go mod tidy - name: Install Nightly Docker - # rootless not supported with ghaction-setup-docker yet - if: ${{ matrix.rootless-docker == false }} uses: crazy-max/ghaction-setup-docker@master with: + rootless: ${{ matrix.rootless-docker }} + version: type=image,tag=master daemon-config: | { "debug": true, @@ -61,11 +57,6 @@ jobs: "containerd-snapshotter": ${{ matrix.containerd-integration }} } } - version: type=image,tag=master - - - name: Install test Docker - if: ${{ matrix.rootless-docker }} - run: curl https://get.docker.com | CHANNEL=test sh - name: go test timeout-minutes: 30