Updated Dockerfile to use heredoc syntax, make.bash for latest psiphon release

Dockerfile

@@ -1,33 +1,34 @@
 ARG BUILDPLATFORM=$BUILDPLATFORM
-FROM --platform=$BUILDPLATFORM golang:1.18 AS psiphon_builder
+ARG GO_VERSION=1.24.1
+FROM --platform=$BUILDPLATFORM golang:$GO_VERSION AS psiphon_builder
 WORKDIR /go
 LABEL stage=builder
-ARG VERSION=2.0.23
 ARG BUILDOS
 ARG BUILDARCH
 ARG TARGETS
-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};                                               \
-		done)
+ARG PSIPHON_VERSION
+ENV DIR=/go/src/github.com/Psiphon-Labs/psiphon-tunnel-core
+ENV GO111MODULE=off
+ENV CGO_ENABLED=0
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN <<__SCRIPT__
+TARGET_PALTFORMS=${TARGETS:-"$BUILDOS/$BUILDARCH"}
+TARGET_PALTFORMS=${TARGET_PALTFORMS//,/ }
+mkdir -p ${DIR}
+curl -sL https://github.com/Psiphon-Labs/psiphon-tunnel-core/archive/refs/tags/v${PSIPHON_VERSION}.tar.gz | tar xz -C ${DIR} --strip-components=1
+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
+__SCRIPT__
 
 FROM swarupsengupta2007/alpine-s6:3.16.0
 ARG TARGETOS
@@ -37,4 +38,5 @@ COPY base/ /
 COPY psiphon.config ${DEF_DEFAULTS}
 COPY --from=psiphon_builder /go/psiphon_${TARGETOS}_${TARGETARCH}_${TARGETVARIANT} ${DEF_APP}/psiphon
 EXPOSE 8080 1080
+HEALTHCHECK --interval=30s --timeout=5s --start-period=2m --retries=3 CMD netstat -ltn|grep 1080 || exit 1
 VOLUME /config

README.md

@@ -30,15 +30,24 @@ docker buildx create --name cross-platform --platform ${TARGETS} --use
 docker buildx build -t <your_tag> . --load
 
 # build for multi-arch and push to registry
-docker buildx build --build-arg TARGETS=${TARGETS} -t <your_username>/<your_tag> \
---platform ${TARGETS} . --push
+# optional, choose targets (defaults to the following list)
+export TARGETS="linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6"
+
+# choose psiphon version
+export VERSION=2.0.31
+
+# choose go version (currently 1.22.7)
+export GO_VERSION=1.22.7
+
+# run the script
+./make.bash --push
 ```
 
 Build-args available
-|build-arg|default|Description|
-|--|--|--|
-|VERSION|2.0.23|psiphon-tunnel-core release version|
-|TARGETS|\<BUIDLOS\>/\<BUILDARCH\>|Targets for cross-compilation for the build stage|
+|build-arg|Description|
+|--|--|
+|VERSION|psiphon-tunnel-core release version|
+|TARGETS|\<BUIDLOS\>/\<BUILDARCH\> (Targets for cross-compilation for the build stage)|
 ---
 
 # Usage

base/etc/services.d/psiphon/finish

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if test "$1" -eq 256 ; then
+  e=$((128 + $2))
+else
+  e="$1"
+fi
+
+echo "$e" > /run/s6-linux-init-container-results/exitcode

make.bash

@@ -1,6 +1,13 @@
 #!/bin/bash
 
-TARGETS="linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6"
+MK_TARGETS=${TARGETS:-"linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6"}
+MK_VERSION=${VERSION:-2.0.32}
+MK_GO_VERSION=${GO_VERSION:-1.23.7}
 
-sudo docker buildx build --build-arg TARGETS=${TARGETS} -t swarupsengupta2007/psiphon:2.0.23 \
--t swarupsengupta2007/psiphon:latest --platform ${TARGETS} . $1
+docker buildx build \
+				--build-arg TARGETS=${MK_TARGETS} \
+				--build-arg PSIPHON_VERSION=${MK_VERSION} \
+				--build-arg GO_VERSION=${MK_GO_VERSION} \
+				-t swarupsengupta2007/psiphon:${MK_VERSION} \
+				-t swarupsengupta2007/psiphon:latest \
+				--platform ${MK_TARGETS} . $1