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

Tweak DSM7 docker build target

Browse Source
This commit is contained in:
Joseph Henry 2022-05-31 12:48:52 -07:00
parent 1a400d33fd
commit 9b42ced27f
No known key found for this signature in database
GPG Key ID: C45B33FF5EBC9344
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make-linux.mk
View File

@ -511,10 +511,10 @@ snap-upload-stable: FORCE
done done
synology-pkg: FORCE synology-pkg: FORCE
cd synology ; ./build.sh build cd pkg/synology ; ./build.sh build
synology-docker: FORCE synology-docker: FORCE
cd synology/dsm7-docker/; ./build.sh build cd pkg/synology/dsm7-docker/; ./build.sh build-and-push
munge_rpm: munge_rpm:
@:$(call check_defined, VERSION) @:$(call check_defined, VERSION)

9
pkg/synology/dsm7-docker/build.sh
View File

@ -3,16 +3,17 @@
ZTO_VER=$(git describe --abbrev=0 --tags) ZTO_VER=$(git describe --abbrev=0 --tags)
ZTO_COMMIT=$(git rev-parse HEAD) ZTO_COMMIT=$(git rev-parse HEAD)
build() build-and-push()
{ {
# build
sudo docker build --load --rm -t zerotier-synology . --build-arg ZTO_COMMIT=${ZTO_COMMIT} --build-arg ZTO_VER=${ZTO_VER} 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
}
push() # push
{
sudo docker login --username=${DOCKERHUB_USERNAME} sudo docker login --username=${DOCKERHUB_USERNAME}
sudo docker push zerotier/zerotier-synology:${ZTO_VER} sudo docker push zerotier/zerotier-synology:${ZTO_VER}
sudo docker push zerotier/zerotier-synology:latest sudo docker push zerotier/zerotier-synology:latest