mirror of
https://github.com/zyclonite/zerotier-docker.git
synced 2024-12-12 17:30:55 +01:00
upgrade to 1.14.0
This commit is contained in:
parent
706b94c2ac
commit
f85eeb21a5
@ -1,7 +1,7 @@
|
|||||||
ARG ALPINE_IMAGE=alpine
|
ARG ALPINE_IMAGE=alpine
|
||||||
ARG ALPINE_VERSION=edge
|
ARG ALPINE_VERSION=edge
|
||||||
ARG ZT_COMMIT=327eb9013b39809835a912c9117a0b9669f4661f
|
ARG ZT_COMMIT=91e7ce87f09ac1cfdeaf6ff22c3cedcd93574c86
|
||||||
ARG ZT_VERSION=1.12.2
|
ARG ZT_VERSION=1.14.0
|
||||||
|
|
||||||
FROM ${ALPINE_IMAGE}:${ALPINE_VERSION} as builder
|
FROM ${ALPINE_IMAGE}:${ALPINE_VERSION} as builder
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
diff --git a/make-linux.mk b/make-linux.mk
|
diff --git a/make-linux.mk b/make-linux.mk
|
||||||
index 48d44a048..693dfe80e 100644
|
index bfa416aa0..9f10cf216 100644
|
||||||
--- a/make-linux.mk
|
--- a/make-linux.mk
|
||||||
+++ b/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
|
ZT_USE_X64_ASM_ED25519=0
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user