mirrors/ZeroTierOne
1
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2026-03-05 21:32:06 -08:00
Code Issues Projects Releases Wiki Activity

another fix for multi-arch builds

Browse source
This commit is contained in:
Grant Limberg 2026-03-04 11:35:51 -08:00
parent 97db010112
commit 34777b6bb4
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
2 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/central-controller-cv1.yaml vendored
View file

@ -34,7 +34,7 @@ jobs:
- name: Build & Push Docker Image
run: |
make central-controller-docker-${{ runner.arch }} --no-print-directory
docker build --no-cache -t registry.zerotier.com/zerotier-central/ztcentral-controller:${{ env.COMMIT_SHORT_SHA }}-${{ steps.branch.outputs.branch_name }}-${{ runner.arch }}-amd64 -f ext/central-controller-docker/Dockerfile . --push
multi-arch-docker:
runs-on: gha-runner-x64

7
make-linux.mk
View file

@ -475,13 +475,6 @@ central-controller-docker: _buildx FORCE
central-controller-docker-X64: FORCE
docker build --platform linux/amd64 --no-cache -t registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP}-amd64 -f ext/central-controller-docker/Dockerfile . --push
central-controller-docker-ARM64: FORCE
docker build --platform linux/arm64 --no-cache -t registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP}-arm64 -f ext/central-controller-docker/Dockerfile . --push
centralv2-controller-docker: _buildx FORCE
docker buildx build --platform linux/amd64,linux/arm64 --no-cache -t us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:$(shell git rev-parse --short HEAD) -f ext/central-controller-docker/Dockerfile --build-arg git_branch=`git name-rev --name-only HEAD` . --push
@echo Image: us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:$(shell git rev-parse --short HEAD)
debug: FORCE
make ZT_DEBUG=1 one
make ZT_DEBUG=1 selftest