diff --git a/README.md b/README.md index c9222e8..d214bcc 100644 --- a/README.md +++ b/README.md @@ -24,13 +24,13 @@ git clone https://github.com/swarupsengupta2007/psiphon-docker TARGETS="linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6" # Create a builder instance if it doesn't exist -sudo docker buildx create --name cross-platform --platform ${TARGETS} --use +docker buildx create --name cross-platform --platform ${TARGETS} --use # Build for current platform and load to docker image -sudo docker buildx build -t . --load +docker buildx build -t . --load # build for multi-arch and push to registry -sudo docker buildx build --build-arg TARGETS=${TARGETS} -t / \ +docker buildx build --build-arg TARGETS=${TARGETS} -t / \ --platform ${TARGETS} . --push ``` @@ -63,8 +63,13 @@ services: ## Using docker-cli
```bash -sudo docker run --name psiphon -d -p 8080:8080 -p 1080:1080 \ --v /home/swarup/psiphon/config/:/config swarupsengupta2007/psiphon +docker run -d \ + --name psiphon \ + --restart=unless-stopped \ + -p 8080:8080 \ + -p 1080:1080 \ + -v /home/swarup/psiphon/config/:/config \ + swarupsengupta2007/psiphon ``` The following Environment var are available
diff --git a/base/etc/services.d/psiphon/run b/base/etc/services.d/psiphon/run index 2816ed8..c262ae8 100755 --- a/base/etc/services.d/psiphon/run +++ b/base/etc/services.d/psiphon/run @@ -1,6 +1,7 @@ #!/usr/bin/with-contenv sh [[ ! -f ${DEF_CONFIG}/psiphon.config ]] && cp ${DEF_DEFAULTS}/psiphon.config ${DEF_CONFIG}/ -[[ ! -d ${DEF_CONFIG}/osl ]] && mkdir ${DEF_CONFIG}/osl -[[ ! -d ${DEF_CONFIG}/remote_server_list ]] && mkdir ${DEF_CONFIG}/remote_server_list + +chown -R ${DEF_USER}:${DEF_USER} ${DEF_CONFIG} + exec s6-setuidgid ${DEF_USER} ${DEF_APP}/psiphon -config ${DEF_CONFIG}/psiphon.config diff --git a/psiphon.config b/psiphon.config index 1a591c2..af1a98a 100644 --- a/psiphon.config +++ b/psiphon.config @@ -1,9 +1,7 @@ { "DataRootDirectory": "/config/", - "DeviceRegion": "US", + "DeviceRegion": "IN", "MigrateDataStoreDirectory": "/config", - "MigrateObfuscatedServerListDownloadDirectory": "/config/osl", - "MigrateRemoteServerListDownloadFilename": "/config/remote_server_list", "ListenInterface": "any", "LocalHttpProxyPort": 8080, "LocalSocksProxyPort": 1080,