From 9842165a5ffa476ae14f157c010d9575a24cbefb Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Mon, 3 Jun 2024 23:31:29 -0600 Subject: [PATCH] Update Apache Traffic Server to 9.2.4 --- .env | 2 +- .github/containers/trafficserver-alpine/Dockerfile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.env b/.env index b1459c9b4b..e5b82e40c3 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ -ATS_VERSION=9.1.2 +ATS_VERSION=9.2.4 GO_VERSION=1.22.3 diff --git a/.github/containers/trafficserver-alpine/Dockerfile b/.github/containers/trafficserver-alpine/Dockerfile index 9bccd32773..6ce641c268 100644 --- a/.github/containers/trafficserver-alpine/Dockerfile +++ b/.github/containers/trafficserver-alpine/Dockerfile @@ -41,6 +41,10 @@ RUN set -o errexit -o nounset -o xtrace; \ --repository=https://dl-cdn.alpinelinux.org/alpine/v3.16/main/ \ libexecinfo-dev; \ cd $dirname; \ + # Fix is from https://github.com/apache/trafficserver-ingress-controller/pull/151 + sed -i 's/PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP/PTHREAD_RWLOCK_INITIALIZER/' \ + include/tscore/ink_rwlock.h \ + include/tscpp/util/TsSharedMutex.h; \ ./configure \ --disable-tests \ --enable-experimental-plugins \