From 4dbdfb69725491a123ae8ce3164925afaeebd661 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Mon, 11 Apr 2022 15:22:13 -0700 Subject: [PATCH 1/4] Fix missing symlink and high CPU usage of route watchdog on Synology --- synology/config.json | 2 +- synology/dsm6-pkg/start-stop-status.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/synology/config.json b/synology/config.json index 0b99541bc..33cf05e15 100644 --- a/synology/config.json +++ b/synology/config.json @@ -1,6 +1,6 @@ { "version": "1.8.7", - "rev": "0", + "rev": "1", "desc": "Securely connect any device, anywhere.", "email": "support@zerotier.com" } diff --git a/synology/dsm6-pkg/start-stop-status.sh b/synology/dsm6-pkg/start-stop-status.sh index 9eea4a4bf..c03f7e2ff 100755 --- a/synology/dsm6-pkg/start-stop-status.sh +++ b/synology/dsm6-pkg/start-stop-status.sh @@ -38,6 +38,8 @@ configure_cli() mkdir -p /usr/local/bin/ ln -s $SYNOPKG_PKGDEST/bin/zerotier-one /usr/local/bin/zerotier-cli ln -s $SYNOPKG_PKGDEST/bin/zerotier-one /usr/local/bin/zerotier-idtool + rm -rf /var/lib/zerotier-one + ln -s /var/packages/zerotier/var /var/lib/zerotier-one } apply_routes() @@ -69,8 +71,8 @@ apply_routes() fi done done - sleep 15 fi + sleep 15 done } From 40681328ec3225bc99483bd31ff92971ed39bed1 Mon Sep 17 00:00:00 2001 From: fuowang <1106694860@qq.com> Date: Tue, 12 Apr 2022 11:33:40 +0800 Subject: [PATCH 2/4] Add loongarch64 support (#1614) * add loongarch64 support --- include/ZeroTierOne.h | 3 ++- make-linux.mk | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index e16d23f87..2d103d847 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -1079,7 +1079,8 @@ enum ZT_Architecture ZT_ARCHITECTURE_DOTNET_CLR = 13, ZT_ARCHITECTURE_JAVA_JVM = 14, ZT_ARCHITECTURE_WEB = 15, - ZT_ARCHITECTURE_S390X = 16 + ZT_ARCHITECTURE_S390X = 16, + ZT_ARCHITECTURE_LOONGARCH64 = 17 }; /** diff --git a/make-linux.mk b/make-linux.mk index ab11cba10..49ada04bd 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -252,6 +252,10 @@ endif ifeq ($(CC_MACH),riscv64) ZT_ARCHITECTURE=0 endif +ifeq ($(CC_MACH),loongarch64) + ZT_ARCHITECTURE=17 + override DEFS+=-DZT_NO_TYPE_PUNNING +endif # Fail if system architecture could not be determined ifeq ($(ZT_ARCHITECTURE),999) From de04240ca68b5c604c2a0b1d1e4f46a80c34fc73 Mon Sep 17 00:00:00 2001 From: Sean McAvoy Date: Tue, 12 Apr 2022 00:24:57 -0400 Subject: [PATCH 3/4] update alpine linux release to current supported (#1599) --- dockerbuild/Dockerfile.alpine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerbuild/Dockerfile.alpine b/dockerbuild/Dockerfile.alpine index 1610ce52e..04c298d15 100644 --- a/dockerbuild/Dockerfile.alpine +++ b/dockerbuild/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM alpine:3.11.3 +FROM alpine:3.15 ARG go_pkg_url From 0e658828fb2bf2f1e1c81dfea3618839e80a7ae0 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Tue, 12 Apr 2022 17:45:54 -0700 Subject: [PATCH 4/4] Add Synology Docker target to Linux makefile --- make-linux.mk | 7 +++++-- synology/dsm7-docker/Dockerfile | 6 ++---- synology/dsm7-docker/build.sh | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/make-linux.mk b/make-linux.mk index ab11cba10..cf30fbb0e 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -486,7 +486,10 @@ snap-upload-stable: FORCE snapcraft upload --release=stable $${SNAPFILE};\ done -synology: FORCE - ./synology/build.sh build +synology-pkg: FORCE + cd synology ; ./build.sh build + +synology-docker: FORCE + cd synology/dsm7-docker/; ./build.sh build FORCE: diff --git a/synology/dsm7-docker/Dockerfile b/synology/dsm7-docker/Dockerfile index f98a22a09..56fd0b448 100644 --- a/synology/dsm7-docker/Dockerfile +++ b/synology/dsm7-docker/Dockerfile @@ -2,19 +2,17 @@ FROM alpine:latest as builder -ARG COMMIT=04b77773c4cd384c359e3a48f40307b288233194 - RUN apk add --no-cache rust cargo RUN apk add openssl-dev RUN apk add --update alpine-sdk linux-headers \ && git clone --quiet https://github.com/zerotier/ZeroTierOne.git /src \ - && git -C src reset --quiet --hard ${COMMIT} \ + && git -C src reset --quiet --hard ${ZTO_COMMIT} \ && cd /src \ && make -f make-linux.mk FROM alpine:latest -LABEL version="1.8.7" +LABEL version=${ZTO_VER} LABEL description="ZeroTier One docker image for Synology NAS" RUN apk add --update --no-cache bash jq libc6-compat libstdc++ diff --git a/synology/dsm7-docker/build.sh b/synology/dsm7-docker/build.sh index d55ef44f9..2b1fadd00 100755 --- a/synology/dsm7-docker/build.sh +++ b/synology/dsm7-docker/build.sh @@ -1,10 +1,11 @@ #!/bin/bash -ZTO_VER=$(jq -r '.version' ../config.json) +ZTO_VER=$(git describe --abbrev=0 --tags) +ZTO_COMMIT=$(git rev-parse HEAD) build() { - sudo docker build --load --rm -t zerotier-synology . + sudo docker build --load --rm -t zerotier-synology . --build-arg ZTO_COMMIT=${ZTO_COMMIT} --build-arg ZTO_VER=${ZTO_VER} LATEST_DOCKER_IMAGE_HASH=$(sudo docker images -q zerotier-synology) sudo docker tag ${LATEST_DOCKER_IMAGE_HASH} zerotier/zerotier-synology:${ZTO_VER} sudo docker tag ${LATEST_DOCKER_IMAGE_HASH} zerotier/zerotier-synology:latest