From 0d4f91910cff8fad96064c1cab767a2f96a35465 Mon Sep 17 00:00:00 2001
From: Swarup Sengupta <swarupsengupta2007@gmail.com>
Date: Sat, 18 Jun 2022 12:57:10 +0530
Subject: [PATCH] Updated dockerfile and README

---
 Dockerfile | 36 ++++++++++++++++++------------------
 README.md  |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f9ae87f..d76c5a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
+ARG BUILDPLATFORM=$BUILDPLATFORM
 FROM --platform=$BUILDPLATFORM golang:1.18 AS psiphon_builder
 WORKDIR /go
 LABEL stage=builder
 ARG VERSION=2.0.23
-ARG BUILDPLATFORM
 ARG BUILDOS
 ARG BUILDARCH
 ARG TARGETS
@@ -10,23 +10,23 @@ ENV DIR=/go/src/github.com/Psiphon-Labs/psiphon-tunnel-core \
 		GO111MODULE=off \
 		CGO_ENABLED=0
 SHELL ["/bin/bash", "-c"]
-RUN TARGET_PALTFORMS=${TARGETS:-"$BUILDOS/$BUILDARCH"}; 																											\
-		mkdir -p ${DIR} 																																											&&	\
-		curl -sL https://github.com/Psiphon-Labs/psiphon-tunnel-core/archive/refs/tags/v${VERSION}.tar.gz |			 	\
-		tar xz -C ${DIR} --strip-components=1 																																&& 	\
-		(IFS=','; for PLATFORM in $TARGET_PALTFORMS; 																															\
-		do 																																																				\
-			OS=${PLATFORM%%/*} 																																									&& 	\
-			ARCH=${PLATFORM#*/} 																																								&& 	\
-			ARCH=${ARCH%/*} 																																										&& 	\
-			VERSION=${PLATFORM##*/} 																																						&& 	\
-			TARGETVARIANT=${VERSION/$ARCH/}																																			&& 	\
-			VERSION=${TARGETVER/v/} 																																						&& 	\
-			GOOS=${OS} GOARCH=${ARCH} go install -a -tags netgo 																										\
-			-ldflags '-w -extldflags "-static"' 																																		\
-			github.com/Psiphon-Labs/psiphon-tunnel-core/ConsoleClient																						&&	\
-			BINARY=$(find /go/bin/* -name "ConsoleClient*") 																										&& 	\
-			mv ${BINARY} /go/psiphon_${OS}_${ARCH}_${TARGETVARIANT};																								\
+RUN TARGET_PALTFORMS=${TARGETS:-"$BUILDOS/$BUILDARCH"};                                                      \
+		mkdir -p ${DIR}                                                                                       && \
+		curl -sL https://github.com/Psiphon-Labs/psiphon-tunnel-core/archive/refs/tags/v${VERSION}.tar.gz |      \
+		tar xz -C ${DIR} --strip-components=1                                                                 && \
+		(IFS=','; for PLATFORM in $TARGET_PALTFORMS;                                                             \
+		do                                                                                                       \
+			OS=${PLATFORM%%/*}                                                                                  && \
+			ARCH=${PLATFORM#*/}                                                                                 && \
+			ARCH=${ARCH%/*}                                                                                     && \
+			VERSION=${PLATFORM##*/}                                                                             && \
+			TARGETVARIANT=${VERSION/$ARCH/}                                                                     && \
+			VERSION=${TARGETVER/v/}                                                                             && \
+			GOOS=${OS} GOARCH=${ARCH} go install -a -tags netgo                                                    \
+			-ldflags '-w -extldflags "-static"'                                                                    \
+			github.com/Psiphon-Labs/psiphon-tunnel-core/ConsoleClient                                           && \
+			BINARY=$(find /go/bin/* -name "ConsoleClient*")                                                     && \
+			mv ${BINARY} /go/psiphon_${OS}_${ARCH}_${TARGETVARIANT};                                               \
 		done)
 
 FROM alpine:3.16.0
diff --git a/README.md b/README.md
index 7bdcf47..f276c29 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ git clone https://github.com/swarupsengupta2007/psiphon-docker
 3. Build docker image for current platform or multi-arch
 ```bash
 # choose target platforms
-TARGETS="linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6"
+TARGETS="linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x"
 
 # Create a builder instance
 sudo docker buildx create --name cross-platform --platform ${TARGETS} --use