Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-22 02:43:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #881 from thewtex/ci-deploy-multiarch

Browse Source 
Ci deploy multiarch
This commit is contained in:
Matt McCormick
2025-05-22 14:26:47 -04:00
committed by GitHub
parent a3b42cd215 a10699233d
commit 1cfb3b1459
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/main.yml vendored
View File

@ -1534,8 +1534,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 }}-amd64 xz -d -k < ./cache-${{ matrix.image_name }}-amd64/${{ matrix.image_name }}-amd64.tar.xz | docker import - dockcross/${{ matrix.image_name }}-amd64:latest-amd64
xz -d -k < ./cache-${{ matrix.image_name }}-arm64/${{ matrix.image_name }}-arm64.tar.xz | docker import - dockcross/${{ matrix.image_name }}-arm64 xz -d -k < ./cache-${{ matrix.image_name }}-arm64/${{ matrix.image_name }}-arm64.tar.xz | docker import - dockcross/${{ matrix.image_name }}-arm64:latest-arm64
- name: Login to Docker Hub - name: Login to Docker Hub
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
@ -1547,11 +1547,14 @@ jobs:
- name: deploy-multi-arch - name: deploy-multi-arch
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
run: | run: |
docker images
make ${{ matrix.image_name }}.tag-amd64 make ${{ matrix.image_name }}.tag-amd64
make ${{ matrix.image_name }}.tag-arm64
make ${{ matrix.image_name }}.push-amd64 make ${{ matrix.image_name }}.push-amd64
export HOST_ARCH=arm64
make ${{ matrix.image_name }}.tag-arm64
make ${{ matrix.image_name }}.push-arm64 make ${{ matrix.image_name }}.push-arm64
unset HOST_ARCH
make ${{ matrix.image_name }}.push make ${{ matrix.image_name }}.push

2
Makefile
View File

@ -30,7 +30,7 @@ TAG_FLAG := $(or $(TAG_FLAG), --tag)
ORG = dockcross ORG = dockcross
# Host architecture # Host architecture
HOST_ARCH := $(shell uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/') HOST_ARCH := $(or $(HOST_ARCH), shell uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')
# Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux2014-x64) # Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux2014-x64)
BIN = ./bin BIN = ./bin