diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d1e4394f3..cc376de06 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,9 +11,15 @@ on: jobs: docker: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v7 + - name: Use classic Docker storage + run: | + echo '{"features":{"containerd-snapshotter":false}}' | sudo tee /etc/docker/daemon.json + sudo systemctl restart docker + docker info --format 'Storage driver: {{ .Driver }}; Docker root: {{ .DockerRootDir }}' + test "$(docker info --format '{{ .Driver }}')" = overlay2 - uses: docker/setup-buildx-action@v4 - run: make docker/build - name: docker login diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a30f7b5e2..01b283fdd 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -82,7 +82,7 @@ jobs: runs-on: ${{ matrix.runs_on }} strategy: matrix: - runs_on: [ubuntu-latest] + runs_on: [ubuntu-24.04] bootstrap: - name: sdl2 target: testapps-with-numpy @@ -107,13 +107,19 @@ jobs: remove-docker-images: 'true' - name: Checkout python-for-android uses: actions/checkout@v7 - - name: Relocate Docker data directory + - name: Configure classic Docker storage on build volume run: | sudo systemctl stop docker sudo mkdir -p "${GITHUB_WORKSPACE}/docker-data" - echo '{"data-root": "'${GITHUB_WORKSPACE}/docker-data'"}' | sudo tee /etc/docker/daemon.json + sudo tee /etc/docker/daemon.json <