From b2432da543f78f4b9eabc70134a51090e429626f Mon Sep 17 00:00:00 2001 From: Swarup Sengupta Date: Mon, 20 Jun 2022 10:36:02 +0530 Subject: [PATCH] Updated docker file to parse variant --- Dockerfile | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d76c5a3..bcadc16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ 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"}; \ +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 && \ @@ -30,7 +30,7 @@ RUN TARGET_PALTFORMS=${TARGETS:-"$BUILDOS/$BUILDARCH"}; done) FROM alpine:3.16.0 -RUN mkdir -p /psiphon /config +RUN mkdir -p /psiphon /config ARG TARGETOS ARG TARGETARCH ARG TARGETVARIANT diff --git a/README.md b/README.md index f276c29..55075f0 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,linux/ppc64le,linux/s390x" +TARGETS="linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6" # Create a builder instance sudo docker buildx create --name cross-platform --platform ${TARGETS} --use @@ -74,6 +74,6 @@ The following Environment var are available
Following ports and volumes are available |Option|switch|Description|Default| |--|--|--|--| -|HTTP PORT|-p host_port:8080|http proxy port|8080| -|SOCKS PORT|-p host_port:1080|socks proxy port|1080| +|HTTP PORT|-p :8080|http proxy port|8080| +|SOCKS PORT|-p :1080|socks proxy port|1080| |VOLUME|-v /path/to/config:/config|The container storage|/config|