From e29b256f926be893e7581ccad5bca1141f04dbd2 Mon Sep 17 00:00:00 2001
From: swarupsengupta2007 <swarupsengupta2007@gmail.com>
Date: Wed, 5 Apr 2023 18:18:53 +0530
Subject: [PATCH] Reset Dockerfile to use base version from which this project
 was based off. Will use build-args to build new images (make.bash)

---
 Dockerfile | 2 +-
 make.bash  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 35ea820..539d738 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ ARG BUILDPLATFORM=$BUILDPLATFORM
 FROM --platform=$BUILDPLATFORM golang:1.18 AS psiphon_builder
 WORKDIR /go
 LABEL stage=builder
-ARG VERSION=2.0.29
+ARG VERSION=2.0.23
 ARG BUILDOS
 ARG BUILDARCH
 ARG TARGETS
diff --git a/make.bash b/make.bash
index 4331067..9b75e83 100755
--- a/make.bash
+++ b/make.bash
@@ -3,5 +3,9 @@
 TARGETS="linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6"
 VERSION=2.0.29
 
-sudo docker buildx build --build-arg TARGETS=${TARGETS} --build-arg VERSION=${VERSION} -t swarupsengupta2007/psiphon:${VERSION} \
--t swarupsengupta2007/psiphon:latest --platform ${TARGETS} . $1
+sudo docker buildx build \
+				--build-arg TARGETS=${TARGETS} \
+				--build-arg VERSION=${VERSION} \
+				-t swarupsengupta2007/psiphon:${VERSION} \
+				-t swarupsengupta2007/psiphon:latest \
+				--platform ${TARGETS} . $1