From 2fbd5dc828a99fbf4d8bfae4efc079e3e1863ae4 Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Thu, 6 Jul 2023 10:12:29 -0700
Subject: [PATCH] docker tags change

---
 ext/central-controller-docker/Dockerfile | 4 ++--
 ext/central-controller-docker/Makefile   | 2 +-
 make-linux.mk                            | 4 ++--
 make-mac.mk                              | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ext/central-controller-docker/Dockerfile b/ext/central-controller-docker/Dockerfile
index 9621b5d38..c134cbdcf 100644
--- a/ext/central-controller-docker/Dockerfile
+++ b/ext/central-controller-docker/Dockerfile
@@ -1,10 +1,10 @@
 # Dockerfile for ZeroTier Central Controllers
-FROM us-central1-docker.pkg.dev/zerotier-central/zerotier/ctlbuild:latest as builder
+FROM registry.zerotier.com/zerotier/ctlbuild:latest as builder
 MAINTAINER Adam Ierymekno <adam.ierymenko@zerotier.com>, Grant Limberg <grant.limberg@zerotier.com>
 ADD . /ZeroTierOne
 RUN export PATH=$PATH:~/.cargo/bin && cd ZeroTierOne && make clean && make central-controller -j8
 
-FROM us-central1-docker.pkg.dev/zerotier-central/zerotier/ctlrun:latest
+FROM registry.zerotier.com/zerotier/ctlrun:latest
 COPY --from=builder /ZeroTierOne/zerotier-one /usr/local/bin/zerotier-one
 RUN chmod a+x /usr/local/bin/zerotier-one
 RUN echo "/usr/local/lib64" > /etc/ld.so.conf.d/usr-local-lib64.conf && ldconfig
diff --git a/ext/central-controller-docker/Makefile b/ext/central-controller-docker/Makefile
index 27b3610e0..46ec8ee16 100644
--- a/ext/central-controller-docker/Makefile
+++ b/ext/central-controller-docker/Makefile
@@ -1,4 +1,4 @@
-registry = us-central1-docker.pkg.dev/zerotier-central/zerotier
+registry = registry.zerotier.com/zerotier
 
 all:	controller-builder controller-runbase
 
diff --git a/make-linux.mk b/make-linux.mk
index 685b3e744..6702d040d 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 us-central1-docker.pkg.dev/zerotier-central/zerotier/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-central/zerotier/ztcentral-controller:${TIMESTAMP}
+	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}
 
 debug:	FORCE
 	make ZT_DEBUG=1 one
diff --git a/make-mac.mk b/make-mac.mk
index 738e3149c..33ecc8f09 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 us-central1-docker.pkg.dev/zerotier-central/zerotier/ztcentral-controller:${TIMESTAMP} -f ext/central-controller-docker/Dockerfile --build-arg git_branch=$(shell git name-rev --name-only HEAD) . --push
-	@echo Image: us-central1-docker.pkg.dev/zerotier-central/zerotier/ztcentral-controller:${TIMESTAMP}
+	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}
 	
 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/