ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-20 17:52:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev

Browse Source
This commit is contained in:
Grant Limberg 2022-04-13 13:54:03 -07:00
commit 6ad047a8fc
No known key found for this signature in database
GPG Key ID: 8F2F97D3BE8D7735
7 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockerbuild/Dockerfile.alpine
View File

@ -1,4 +1,4 @@
FROM alpine:3.11.3 FROM alpine:3.15
ARG go_pkg_url ARG go_pkg_url

3
include/ZeroTierOne.h
View File

@ -1079,7 +1079,8 @@ enum ZT_Architecture
ZT_ARCHITECTURE_DOTNET_CLR = 13, ZT_ARCHITECTURE_DOTNET_CLR = 13,
ZT_ARCHITECTURE_JAVA_JVM = 14, ZT_ARCHITECTURE_JAVA_JVM = 14,
ZT_ARCHITECTURE_WEB = 15, ZT_ARCHITECTURE_WEB = 15,
ZT_ARCHITECTURE_S390X = 16 ZT_ARCHITECTURE_S390X = 16,
ZT_ARCHITECTURE_LOONGARCH64 = 17
}; };
/** /**

11
make-linux.mk
View File

@ -252,6 +252,10 @@ endif
ifeq ($(CC_MACH),riscv64) ifeq ($(CC_MACH),riscv64)
ZT_ARCHITECTURE=0 ZT_ARCHITECTURE=0
endif endif
ifeq ($(CC_MACH),loongarch64)
ZT_ARCHITECTURE=17
override DEFS+=-DZT_NO_TYPE_PUNNING
endif
# Fail if system architecture could not be determined # Fail if system architecture could not be determined
ifeq ($(ZT_ARCHITECTURE),999) ifeq ($(ZT_ARCHITECTURE),999)
@ -486,7 +490,10 @@ snap-upload-stable: FORCE
snapcraft upload --release=stable $${SNAPFILE};\ snapcraft upload --release=stable $${SNAPFILE};\
done done
synology: FORCE synology-pkg: FORCE
./synology/build.sh build cd synology ; ./build.sh build
synology-docker: FORCE
cd synology/dsm7-docker/; ./build.sh build
FORCE: FORCE:

2
synology/config.json
View File

@ -1,6 +1,6 @@
{ {
"version": "1.8.7", "version": "1.8.7",
"rev": "0", "rev": "1",
"desc": "Securely connect any device, anywhere.", "desc": "Securely connect any device, anywhere.",
"email": "support@zerotier.com" "email": "support@zerotier.com"
} }

4
synology/dsm6-pkg/start-stop-status.sh
View File

@ -38,6 +38,8 @@ configure_cli()
mkdir -p /usr/local/bin/ 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-cli
ln -s $SYNOPKG_PKGDEST/bin/zerotier-one /usr/local/bin/zerotier-idtool 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() apply_routes()
@ -69,8 +71,8 @@ apply_routes()
fi fi
done done
done done
sleep 15
fi fi
sleep 15
done done
} }

6
synology/dsm7-docker/Dockerfile
View File

@ -2,19 +2,17 @@
FROM alpine:latest as builder FROM alpine:latest as builder
ARG COMMIT=04b77773c4cd384c359e3a48f40307b288233194
RUN apk add --no-cache rust cargo RUN apk add --no-cache rust cargo
RUN apk add openssl-dev RUN apk add openssl-dev
RUN apk add --update alpine-sdk linux-headers \ RUN apk add --update alpine-sdk linux-headers \
&& git clone --quiet https://github.com/zerotier/ZeroTierOne.git /src \ && 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 \ && cd /src \
&& make -f make-linux.mk && make -f make-linux.mk
FROM alpine:latest FROM alpine:latest
LABEL version="1.8.7" LABEL version=${ZTO_VER}
LABEL description="ZeroTier One docker image for Synology NAS" LABEL description="ZeroTier One docker image for Synology NAS"
RUN apk add --update --no-cache bash jq libc6-compat libstdc++ RUN apk add --update --no-cache bash jq libc6-compat libstdc++

5
synology/dsm7-docker/build.sh
View File

@ -1,10 +1,11 @@
#!/bin/bash #!/bin/bash
ZTO_VER=$(jq -r '.version' ../config.json) ZTO_VER=$(git describe --abbrev=0 --tags)
ZTO_COMMIT=$(git rev-parse HEAD)
build() 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) 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:${ZTO_VER}
sudo docker tag ${LATEST_DOCKER_IMAGE_HASH} zerotier/zerotier-synology:latest sudo docker tag ${LATEST_DOCKER_IMAGE_HASH} zerotier/zerotier-synology:latest