Merge pull request #941 from bensuperpc/bensuperpc/fix-ci

Fix import/export docker image
This commit is contained in:
Bensuperpc
2026-07-12 06:13:54 +02:00
committed by GitHub
+7 -7
View File
@@ -32,7 +32,7 @@ jobs:
- name: archive base - name: archive base
run: | run: |
mkdir -p cache mkdir -p cache
docker export dockcross/base:latest | xz -e9 -T0 > ./cache/base.tar.xz docker save dockcross/base:latest | xz -e6 -T0 > ./cache/base.tar.xz
- name: save base - name: save base
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v7
@@ -83,7 +83,7 @@ jobs:
- name: archive base - name: archive base
run: | run: |
mkdir -p cache mkdir -p cache
docker export dockcross/base:latest-${{ env.HOST_ARCH }} | xz -e9 -T0 > ./cache/base-multiarch.tar.xz docker save dockcross/base:latest-${{ env.HOST_ARCH }} | xz -e6 -T0 > ./cache/base-multiarch.tar.xz
- name: save base - name: save base
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v7
@@ -1393,7 +1393,7 @@ jobs:
path: ./cache path: ./cache
- name: load base - name: load base
run: xz -d -k < ./cache/base.tar.xz | docker import - dockcross/base:latest run: xz -d -k < ./cache/base.tar.xz | docker load
- uses: actions/download-artifact@v8 - uses: actions/download-artifact@v8
with: with:
@@ -1401,7 +1401,7 @@ jobs:
path: ./cache path: ./cache
- name: load multiarch base - name: load multiarch base
run: xz -d -k < ./cache/base-multiarch.tar.xz | docker import - dockcross/base:latest-${{ env.HOST_ARCH }} run: xz -d -k < ./cache/base-multiarch.tar.xz | docker load
- name: build - name: build
env: env:
@@ -1549,7 +1549,7 @@ jobs:
if: matrix.arch_name.multiarch == 'yes' if: matrix.arch_name.multiarch == 'yes'
run: | run: |
mkdir -p cache-${{ matrix.arch_name.image }}-${{ env.HOST_ARCH }} mkdir -p cache-${{ matrix.arch_name.image }}-${{ env.HOST_ARCH }}
docker export dockcross/${{ matrix.arch_name.image }}:latest-${{ env.HOST_ARCH }} | xz -e9 -T0 > ./cache-${{ matrix.arch_name.image }}-${{ env.HOST_ARCH }}/${{ matrix.arch_name.image }}-${{ env.HOST_ARCH }}.tar.xz docker save dockcross/${{ matrix.arch_name.image }}:latest-${{ env.HOST_ARCH }} | xz -e6 -T0 > ./cache-${{ matrix.arch_name.image }}-${{ env.HOST_ARCH }}/${{ matrix.arch_name.image }}-${{ env.HOST_ARCH }}.tar.xz
- name: save ${{ matrix.arch_name.image }}-${{ matrix.os }} - name: save ${{ matrix.arch_name.image }}-${{ matrix.os }}
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v7
@@ -1600,8 +1600,8 @@ jobs:
- name: load images - name: load images
run: | run: |
xz -d -k < ./cache-${{ matrix.image_name }}-amd64/${{ matrix.image_name }}-amd64.tar.xz | docker import - dockcross/${{ matrix.image_name }}:latest-amd64 xz -d -k < ./cache-${{ matrix.image_name }}-amd64/${{ matrix.image_name }}-amd64.tar.xz | docker load
xz -d -k < ./cache-${{ matrix.image_name }}-arm64/${{ matrix.image_name }}-arm64.tar.xz | docker import - dockcross/${{ matrix.image_name }}:latest-arm64 xz -d -k < ./cache-${{ matrix.image_name }}-arm64/${{ matrix.image_name }}-arm64.tar.xz | docker load
- name: Login to Docker Hub - name: Login to Docker Hub
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'