From e3c5953a161c297c49ff5d0f93a46169e2b4bdaf Mon Sep 17 00:00:00 2001 From: Lukas Prettenthaler Date: Thu, 24 Aug 2023 09:13:46 +0200 Subject: [PATCH] upgrade to 1.12.0 --- Dockerfile | 4 ++-- patches/disable-sso.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a525b66..24a27cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG ALPINE_IMAGE=alpine ARG ALPINE_VERSION=edge -ARG ZT_COMMIT=d831fd10d5d1a9acb46f07d9548a96fc73a23d72 -ARG ZT_VERSION=1.10.6 +ARG ZT_COMMIT=0e5651f353b99302dd3571ef9dcebbffe52056df +ARG ZT_VERSION=1.12.0 FROM ${ALPINE_IMAGE}:${ALPINE_VERSION} as builder diff --git a/patches/disable-sso.patch b/patches/disable-sso.patch index ea4aa98..8a069ba 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 5d1155c9e..3f19eb687 100644 +index 48d44a048..693dfe80e 100644 --- a/make-linux.mk +++ b/make-linux.mk -@@ -280,6 +280,7 @@ ifeq ($(ZT_IA32),1) +@@ -291,6 +291,7 @@ ifeq ($(ZT_IA32),1) ZT_USE_X64_ASM_ED25519=0 endif