From 33b0888580cbabd67395a6504a7d0bd40a84e430 Mon Sep 17 00:00:00 2001
From: swarupsengupta2007 <swarupsengupta2007@gmail.com>
Date: Sat, 4 May 2024 01:54:41 +0530
Subject: [PATCH] modified Dockerfile to accept go version as build arg

---
 Dockerfile | 3 ++-
 make.bash  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b3e5265..0c650cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 ARG BUILDPLATFORM=$BUILDPLATFORM
-FROM --platform=$BUILDPLATFORM golang:1.20 AS psiphon_builder
+ARG GO_VERSION=$GO_VERSION
+FROM --platform=$BUILDPLATFORM golang:$GO_VERSION AS psiphon_builder
 WORKDIR /go
 LABEL stage=builder
 ARG VERSION=2.0.23
diff --git a/make.bash b/make.bash
index f065df6..cba99e2 100755
--- a/make.bash
+++ b/make.bash
@@ -2,10 +2,12 @@
 
 TARGETS="linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6"
 VERSION=2.0.30
+GO_VERSION=1.20
 
 sudo docker buildx build \
 				--build-arg TARGETS=${TARGETS} \
 				--build-arg VERSION=${VERSION} \
+				--build-arg GO_VERSION=${GO_VERSION} \
 				-t swarupsengupta2007/psiphon:${VERSION} \
 				-t swarupsengupta2007/psiphon:latest \
 				--platform ${TARGETS} . $1