mirror of
https://github.com/bensuperpc/dockcross.git
synced 2025-06-20 09:54:28 +02:00
ci: mock HOST_ARCH for image tagging and push during deployment
We want to apply the versioned tag.
This commit is contained in:
6
.github/workflows/main.yml
vendored
6
.github/workflows/main.yml
vendored
@ -1550,9 +1550,11 @@ jobs:
|
|||||||
docker images
|
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
2
Makefile
@ -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
|
||||||
|
Reference in New Issue
Block a user