From 35d37559c831b007e31a259cfbe5d36691b025a7 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Thu, 1 May 2025 12:57:54 -0700 Subject: [PATCH] v2controller docker target on mac --- make-linux.mk | 2 +- make-mac.mk | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/make-linux.mk b/make-linux.mk index 0cf581bc6..dbe6713c7 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -433,7 +433,7 @@ central-controller-docker: _buildx FORCE centralv2-controller-docker: _buildx FORCE docker buildx build --platform linux/amd64,linux/arm64 --no-cache -t us-central1-docker.pkg.dev/zerotier-d648c7/central-v2/ztcentral-controller:${TIMESTAMP} -f ext/central-controller-docker/Dockerfile --build-arg git_branch=`git name-rev --name-only HEAD` . --push - @echo Image: registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} + @echo Image: us-central1-docker.pkg.dev/zerotier-d648c7/central-v2/ztcentral-controller:${TIMESTAMP} debug: FORCE make ZT_DEBUG=1 one diff --git a/make-mac.mk b/make-mac.mk index 1e67884c8..bc1940723 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -208,6 +208,10 @@ central-controller-docker: _buildx FORCE docker buildx build --platform linux/arm64,linux/amd64 --no-cache -t registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} -f ext/central-controller-docker/Dockerfile --build-arg git_branch=$(shell git name-rev --name-only HEAD) . --push @echo Image: registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} +centralv2-controller-docker: _buildx FORCE + docker buildx build --platform linux/amd64,linux/arm64 --no-cache -t us-central1-docker.pkg.dev/zerotier-d648c7/central-v2/ztcentral-controller:${TIMESTAMP} -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-d648c7/central-v2/ztcentral-controller:${TIMESTAMP} + docker-release: _buildx docker buildx build --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/mips64le,linux/ppc64le,linux/s390x -t zerotier/zerotier:${RELEASE_DOCKER_TAG} -t zerotier/zerotier:latest --build-arg VERSION=${RELEASE_VERSION} -f Dockerfile.release . --push