extern/zerotier-docker
1
0
Fork 1
mirror of https://github.com/zyclonite/zerotier-docker.git synced 2025-01-07 05:59:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zyclonite:main' into master

Browse Source
This commit is contained in:
bfg100k 2024-05-03 10:42:23 +10:00 committed by GitHub
commit 199dcfc842
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,7 +1,7 @@
ARG ALPINE_IMAGE=alpine
ARG ALPINE_VERSION=edge
ARG ZT_COMMIT=327eb9013b39809835a912c9117a0b9669f4661f
ARG ZT_VERSION=1.12.2
ARG ZT_COMMIT=91e7ce87f09ac1cfdeaf6ff22c3cedcd93574c86
ARG ZT_VERSION=1.14.0
FROM ${ALPINE_IMAGE}:${ALPINE_VERSION} as builder

4
patches/disable-sso.patch
View File

@ -1,8 +1,8 @@
diff --git a/make-linux.mk b/make-linux.mk
index 48d44a048..693dfe80e 100644
index bfa416aa0..9f10cf216 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -291,6 +291,7 @@ ifeq ($(ZT_IA32),1)
@@ -292,6 +292,7 @@ ifeq ($(ZT_IA32),1)
ZT_USE_X64_ASM_ED25519=0
endif