diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml index 6792948..279d23e 100644 --- a/.github/workflows/multiarch.yml +++ b/.github/workflows/multiarch.yml @@ -51,7 +51,7 @@ jobs: run: podman save -o /tmp/image.tar ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} - name: Upload artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: image-${{ matrix.platform.tag }} path: /tmp/image.tar @@ -63,7 +63,7 @@ jobs: environment: production steps: - name: Download artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 - name: Setup podman and buildah uses: zyclonite/setup-podman@v1 diff --git a/.github/workflows/router.yml b/.github/workflows/router.yml index 985f408..efd070e 100644 --- a/.github/workflows/router.yml +++ b/.github/workflows/router.yml @@ -60,7 +60,7 @@ jobs: run: podman save -o /tmp/image.tar ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} - name: Upload artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: image-${{ matrix.platform.tag }} path: /tmp/image.tar @@ -72,7 +72,7 @@ jobs: environment: production steps: - name: Download artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 - name: Setup podman and buildah uses: zyclonite/setup-podman@v1 diff --git a/Dockerfile b/Dockerfile index 5465d72..3c6f8db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG ALPINE_IMAGE=alpine ARG ALPINE_VERSION=edge -ARG ZT_COMMIT=651f45fe29155c462f4e56dd74f4a347f6861d0d -ARG ZT_VERSION=1.10.1 +ARG ZT_COMMIT=327eb9013b39809835a912c9117a0b9669f4661f +ARG ZT_VERSION=1.12.2 FROM ${ALPINE_IMAGE}:${ALPINE_VERSION} as builder diff --git a/README-router.md b/README-router.md index 0fe1c83..533d034 100644 --- a/README-router.md +++ b/README-router.md @@ -16,7 +16,7 @@ Technically, this could be described as a *half-router*: ``` console $ docker run --name zerotier-one --device=/dev/net/tun \ --cap-add=NET_ADMIN --cap-add=NET_RAW --cap-add=SYS_ADMIN \ - --env TZ=Etc/UTC --env PUID=999 -env PGID=994 \ + --env TZ=Etc/UTC --env PUID=999 --env PGID=994 \ --env ZEROTIER_ONE_LOCAL_PHYS=eth0 \ --env ZEROTIER_ONE_USE_IPTABLES_NFT=false \ --env ZEROTIER_ONE_GATEWAY_MODE=inbound \ diff --git a/patches/disable-sso.patch b/patches/disable-sso.patch index 7b8ad67..8a069ba 100644 --- a/patches/disable-sso.patch +++ b/patches/disable-sso.patch @@ -1,8 +1,8 @@ diff --git a/make-linux.mk b/make-linux.mk -index 3941573c..d56f560d 100644 +index 48d44a048..693dfe80e 100644 --- a/make-linux.mk +++ b/make-linux.mk -@@ -272,6 +272,7 @@ ifeq ($(ZT_IA32),1) +@@ -291,6 +291,7 @@ ifeq ($(ZT_IA32),1) ZT_USE_X64_ASM_ED25519=0 endif diff --git a/scripts/entrypoint-router.sh b/scripts/entrypoint-router.sh index d314326..7f5c1ef 100755 --- a/scripts/entrypoint-router.sh +++ b/scripts/entrypoint-router.sh @@ -99,7 +99,8 @@ update_iptables() { update_iptables "A" "adding" # define where the ZeroTier daemon will write its output (if any) -TAIL_PIPE=$(mktemp /tmp/zerotier-ipc-XXXXXX) +TAIL_PIPE="/tmp/zerotier-ipc-log" +cat /dev/null >"${TAIL_PIPE}" # start listening and echoing anything that appears there into this process tail -f "${TAIL_PIPE}" & @@ -125,20 +126,12 @@ termination_handler() { update_iptables "D" "removing" # relay the termination message to the daemon + # (the pipe listener is cleaned up automatically) if [ -d "/proc/${ZEROTIER_DAEMON_PID}" ] ; then kill -TERM ${ZEROTIER_DAEMON_PID} wait ${ZEROTIER_DAEMON_PID} fi - # tell the pipe listener to go away too - if [ -d "/proc/${TAIL_PIPE_PID}" ] ; then - kill -TERM ${TAIL_PIPE_PID} - wait ${TAIL_PIPE_PID} - fi - - # clean up the pipe file - rm "${TAIL_PIPE}" - } # set up termination handler (usually catches TERM)