From f85eeb21a561b3a9a77ef983e88364e96aa1a899 Mon Sep 17 00:00:00 2001 From: Lukas Prettenthaler Date: Thu, 2 May 2024 17:58:13 -0600 Subject: [PATCH] upgrade to 1.14.0 --- Dockerfile | 4 ++-- patches/disable-sso.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c6f8db..46ef26e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/patches/disable-sso.patch b/patches/disable-sso.patch index 8a069ba..bf39fc3 100644 --- a/patches/disable-sso.patch +++ b/patches/disable-sso.patch @@ -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