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

Add Synology Docker target to Linux makefile

Browse Source
This commit is contained in:
Joseph Henry 2022-04-12 17:45:54 -07:00
parent 4dbdfb6972
commit 0e658828fb
No known key found for this signature in database
GPG Key ID: C45B33FF5EBC9344
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make-linux.mk
View File

@ -486,7 +486,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:

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