marcel/zoraxy
1
0
Fork 0
mirror of https://github.com/tobychui/zoraxy.git synced 2025-06-03 06:07:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into v3.1.4

Browse Source
This commit is contained in:
Toby Chui 2024-11-24 12:37:58 +08:00 committed by GitHub
commit 4d4492069d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/Dockerfile
View File

@ -58,7 +58,7 @@ ENV WEBROOT="./www"
ENV ZTAUTH="" ENV ZTAUTH=""
ENV ZTPORT="9993" ENV ZTPORT="9993"
VOLUME [ "/opt/zoraxy/config/", "/var/lib/zerotier-one/" ] VOLUME [ "/opt/zoraxy/config/" ]
ENTRYPOINT [ "/opt/zoraxy/entrypoint.sh" ] ENTRYPOINT [ "/opt/zoraxy/entrypoint.sh" ]

4
docker/entrypoint.sh
View File

@ -4,6 +4,10 @@ update-ca-certificates
echo "CA certificates updated" echo "CA certificates updated"
if [ "$ZEROTIER" = "true" ]; then if [ "$ZEROTIER" = "true" ]; then
if [ ! -d "/opt/zoraxy/config/zerotier/" ]; then
mkdir -p /opt/zoraxy/config/zerotier/
fi
ln -s /opt/zoraxy/config/zerotier/ /var/lib/zerotier-one
zerotier-one -d zerotier-one -d
echo "ZeroTier daemon started" echo "ZeroTier daemon started"
fi fi

1
src/main.go
View File

@ -46,6 +46,7 @@ import (
"imuslab.com/zoraxy/mod/utils" "imuslab.com/zoraxy/mod/utils"
) )
/* SIGTERM handler, do shutdown sequences before closing */ /* SIGTERM handler, do shutdown sequences before closing */
func SetupCloseHandler() { func SetupCloseHandler() {
c := make(chan os.Signal, 2) c := make(chan os.Signal, 2)