From 12e64aa1913abe65bf82fac9a1d8912140e441ab Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Thu, 20 Jul 2023 16:22:03 -0700 Subject: [PATCH] fix docker tag for controllers (#2066) --- make-linux.mk | 4 ++-- make-mac.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/make-linux.mk b/make-linux.mk index 6702d040d..94bbe0dbb 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -419,8 +419,8 @@ central-controller: FORCE make -j4 ZT_CONTROLLER=1 one central-controller-docker: _buildx FORCE - docker buildx build --platform linux/amd64,linux/arm64 --no-cache -t registry.zerotier.com/zerotier/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/ztcentral-controller:${TIMESTAMP} + docker buildx build --platform linux/amd64,linux/arm64 --no-cache -t registry.zerotier.com/zerotier-central/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} debug: FORCE make ZT_DEBUG=1 one diff --git a/make-mac.mk b/make-mac.mk index 33ecc8f09..5da90a931 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -184,8 +184,8 @@ _buildx: @echo docker buildx inspect --bootstrap central-controller-docker: _buildx FORCE - docker buildx build --platform linux/arm64,linux/amd64 --no-cache -t registry.zerotier.com/zerotier/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/ztcentral-controller:${TIMESTAMP} + 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} clean: rm -rf MacEthernetTapAgent *.dSYM build-* *.a *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli zerotier doc/node_modules zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_* zeroidc/target/