disable sso

zyclonite · May 24, 2022 · e2a1c86 · e2a1c86
1 parent d560485
commit e2a1c86
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git 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
@@ -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