From e2a1c86072f48862c970da5d1224a656287e1cdb Mon Sep 17 00:00:00 2001 From: Lukas Prettenthaler Date: Tue, 24 May 2022 11:03:18 +0200 Subject: [PATCH] disable sso --- Dockerfile | 4 +++- patches/disable-sso.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 patches/disable-sso.patch diff --git a/Dockerfile b/Dockerfile index 8fb9f30..2f09681 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,11 +7,13 @@ FROM ${ALPINE_IMAGE}:${ALPINE_VERSION} as builder ARG ZT_COMMIT +COPY patches /patches + RUN apk add --update alpine-sdk linux-headers openssl-dev \ - && apk add cargo || true \ && git clone --quiet https://github.com/zerotier/ZeroTierOne.git /src \ && git -C src reset --quiet --hard ${ZT_COMMIT} \ && cd /src \ + && git apply /patches/* \ && make -f make-linux.mk FROM ${ALPINE_IMAGE}:${ALPINE_VERSION} diff --git a/patches/disable-sso.patch b/patches/disable-sso.patch new file mode 100644 index 0000000..b9cd8a1 --- /dev/null +++ b/patches/disable-sso.patch @@ -0,0 +1,12 @@ +diff --git a/make-linux.mk b/make-linux.mk +index 1caf3acc..ade5809a 100644 +--- a/make-linux.mk ++++ b/make-linux.mk +@@ -274,6 +274,7 @@ ifeq ($(ZT_IA32),1) + ZT_USE_X64_ASM_ED25519=0 + endif + ++ZT_SSO_SUPPORTED=0 + ifeq ($(ZT_SSO_SUPPORTED), 1) + ifeq ($(ZT_EMBEDDED),) + override DEFS+=-DZT_SSO_SUPPORTED=1