From 9b42ced27fddfd86cc3669e82f5606098a751191 Mon Sep 17 00:00:00 2001
From: Joseph Henry <joseph.henry@zerotier.com>
Date: Tue, 31 May 2022 12:48:52 -0700
Subject: [PATCH] Tweak DSM7 docker build target

---
 make-linux.mk                     | 4 ++--
 pkg/synology/dsm7-docker/build.sh | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/make-linux.mk b/make-linux.mk
index be970dbdc..e902659c1 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -511,10 +511,10 @@ snap-upload-stable: FORCE
 	done
 
 synology-pkg: FORCE
-	cd synology ; ./build.sh build
+	cd pkg/synology ; ./build.sh build
 
 synology-docker: FORCE
-	cd synology/dsm7-docker/; ./build.sh build
+	cd pkg/synology/dsm7-docker/; ./build.sh build-and-push
 
 munge_rpm:
 	@:$(call check_defined, VERSION)
diff --git a/pkg/synology/dsm7-docker/build.sh b/pkg/synology/dsm7-docker/build.sh
index 2b1fadd00..f8478157b 100755
--- a/pkg/synology/dsm7-docker/build.sh
+++ b/pkg/synology/dsm7-docker/build.sh
@@ -3,16 +3,17 @@
 ZTO_VER=$(git describe --abbrev=0 --tags)
 ZTO_COMMIT=$(git rev-parse HEAD)
 
-build()
+build-and-push()
 {
+  # build
+
   sudo docker build --load --rm -t zerotier-synology . --build-arg ZTO_COMMIT=${ZTO_COMMIT} --build-arg ZTO_VER=${ZTO_VER}
   LATEST_DOCKER_IMAGE_HASH=$(sudo docker images -q zerotier-synology)
   sudo docker tag ${LATEST_DOCKER_IMAGE_HASH} zerotier/zerotier-synology:${ZTO_VER}
   sudo docker tag ${LATEST_DOCKER_IMAGE_HASH} zerotier/zerotier-synology:latest
-}
 
-push()
-{
+  # push
+
   sudo docker login --username=${DOCKERHUB_USERNAME}
   sudo docker push zerotier/zerotier-synology:${ZTO_VER}
   sudo docker push zerotier/zerotier-synology:latest