From 8a7cb756dc6b3c562df92a5fc92c2f4e390f4094 Mon Sep 17 00:00:00 2001
From: winkidney <winkidney@gmail.com>
Date: Sat, 23 Apr 2022 06:34:20 -0700
Subject: [PATCH] refactor: simplify docker build scripts

---
 docker/build_docker.sh                   |  8 ++++----
 docker/build_docker_multiple_platform.sh | 10 +++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/docker/build_docker.sh b/docker/build_docker.sh
index 3b4f5d5..2ad0862 100755
--- a/docker/build_docker.sh
+++ b/docker/build_docker.sh
@@ -5,8 +5,8 @@ script_dir="$( dirname "${0}" )"
 IMAGE_LATEST_TAG="latest"
 IMAGE_VERSION_TAG=`git tag -l --sort=-creatordate | head -n 1 | sed "s/v//g"`
 
-sudo docker build -t getpinry/pinry:${IMAGE_LATEST_TAG} "${script_dir}/../" \
-  -f "${script_dir}/../Dockerfile.autobuild"
-
-sudo docker build -t getpinry/pinry:${IMAGE_VERSION_TAG} "${script_dir}/../" \
+sudo docker build \
+  -t getpinry/pinry:${IMAGE_VERSION_TAG} \
+  -t getpinry/pinry:${IMAGE_LATEST_TAG} \
+  "${script_dir}/../" \
   -f "${script_dir}/../Dockerfile.autobuild"
diff --git a/docker/build_docker_multiple_platform.sh b/docker/build_docker_multiple_platform.sh
index f280b1b..8305257 100755
--- a/docker/build_docker_multiple_platform.sh
+++ b/docker/build_docker_multiple_platform.sh
@@ -8,11 +8,7 @@ IMAGE_VERSION_TAG=`git tag -l --sort=-creatordate | head -n 1 | sed "s/v//g"`
 sudo docker buildx build \
   --push \
   --platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
-  -t getpinry/pinry:${IMAGE_LATEST_TAG} "${script_dir}/../" \
-  -f "${script_dir}/../Dockerfile.autobuild"
-
-sudo docker buildx build \
-  --push \
-  --platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
-  -t getpinry/pinry:${IMAGE_VERSION_TAG} "${script_dir}/../" \
+  -t getpinry/pinry:${IMAGE_LATEST_TAG} \
+  -t getpinry/pinry:${IMAGE_VERSION_TAG} \
+  "${script_dir}/../" \
   -f "${script_dir}/../Dockerfile.autobuild"