void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tweaking

Browse source
This commit is contained in:
Sean OMeara 2023-03-20 13:26:08 +01:00
parent 8507506fe0
commit 85f2881089
No known key found for this signature in database
GPG key ID: 7215FDCD4EFD5E2F
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ci/scripts/build.sh
View file

@ -12,10 +12,8 @@ source "$(dirname $0)/lib.sh"
if [ -f "ci/Dockerfile-build.${ZT_NAME}" ]; then if [ -f "ci/Dockerfile-build.${ZT_NAME}" ]; then
DOCKERFILE="ci/Dockerfile-build.${ZT_NAME}" DOCKERFILE="ci/Dockerfile-build.${ZT_NAME}"
echo "USING DOCKERFILE ${DOCKERFILE}"
else else
DOCKERFILE="ci/Dockerfile-build.${PKGFMT}" DOCKERFILE="ci/Dockerfile-build.${PKGFMT}"
echo "USING DOCKERFILE ${DOCKERFILE}"
fi fi
echo "#~~~~~~~~~~~~~~~~~~~~" echo "#~~~~~~~~~~~~~~~~~~~~"
@ -34,10 +32,8 @@ echo "PWD: ${PWD}"
echo "DOCKERFILE: ${DOCKERFILE}" echo "DOCKERFILE: ${DOCKERFILE}"
echo "#~~~~~~~~~~~~~~~~~~~~" echo "#~~~~~~~~~~~~~~~~~~~~"
# if [ ${BUILD_EVENT} == "push" ]; then
make munge_rpm zerotier-one.spec VERSION=${VERSION} make munge_rpm zerotier-one.spec VERSION=${VERSION}
make munge_deb debian/changelog VERSION=${VERSION} make munge_deb debian/changelog VERSION=${VERSION}
# fi
docker buildx build \ docker buildx build \
--build-arg ZT_NAME="${ZT_NAME}" \ --build-arg ZT_NAME="${ZT_NAME}" \

8
make-linux.mk
View file

@ -519,6 +519,14 @@ synology-pkg: FORCE
synology-docker: FORCE synology-docker: FORCE
cd pkg/synology/dsm7-docker/; ./build.sh build-and-push cd pkg/synology/dsm7-docker/; ./build.sh build-and-push
check_defined = \
$(strip $(foreach 1,$1, \
$(call __check_defined,$1,$(strip $(value 2)))))
__check_defined = \
$(if $(value $1),, \
$(error Undefined $1$(if $2, ($2))))
munge_rpm: munge_rpm:
@:$(call check_defined, VERSION) @:$(call check_defined, VERSION)
@echo "Updating rpm spec to $(VERSION)" @echo "Updating rpm spec to $(VERSION)"