This is an automated email from the ASF dual-hosted git repository. kichan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push: new a66e226 Upgrades to ATS/alpine (#172) a66e226 is described below commit a66e2264dc68fb61c8b969cf4eceea6f7985de51 Author: Kit Chan <kic...@apache.org> AuthorDate: Thu Dec 7 15:01:36 2023 +0100 Upgrades to ATS/alpine (#172) * Upgrades to ATS/alpine * Update README.md --- Dockerfile | 18 ++++++++++-------- README.md | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 77e4831..a1dc7ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,14 +15,14 @@ # limitations under the License. # -FROM alpine:3.16.5 as builder +FROM alpine:3.16.7 as builder RUN apk add --no-cache --virtual .tools \ - bzip2 curl git automake libtool autoconf make sed file perl openrc openssl + bzip2 curl=8.4.0-r0 nghttp2-libs=1.47.0-r2 git automake libtool autoconf make sed file perl openrc openssl=1.1.1w-r1 # ATS dependencies RUN apk add --no-cache --virtual .ats-build-deps \ - build-base openssl-dev tcl-dev pcre-dev zlib-dev \ + build-base openssl-dev=1.1.1w-r1 tcl-dev pcre-dev zlib-dev \ libexecinfo-dev linux-headers libunwind-dev \ brotli-dev jansson-dev luajit-dev readline-dev geoip-dev libxml2-dev @@ -34,8 +34,8 @@ RUN adduser -S -D -H -u 1000 -h /tmp -s /sbin/nologin -G ats -g ats ats # download and build ATS # patch 2 files due to pthread in musl vs glibc - see https://github.com/apache/trafficserver/pull/7611/files -RUN curl -L https://downloads.apache.org/trafficserver/trafficserver-9.2.0.tar.bz2 | bzip2 -dc | tar xf - \ - && cd trafficserver-9.2.0/ \ +RUN curl -L https://downloads.apache.org/trafficserver/trafficserver-9.2.3.tar.bz2 | bzip2 -dc | tar xf - \ + && cd trafficserver-9.2.3/ \ && sed -i "s/PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP/PTHREAD_RWLOCK_INITIALIZER/" include/tscore/ink_rwlock.h \ && sed -i "s/PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP/PTHREAD_RWLOCK_INITIALIZER/" include/tscpp/util/TsSharedMutex.h \ && autoreconf -if \ @@ -123,16 +123,18 @@ RUN mkdir -p /opt/ats/var/run/redis/ \ # set up ingress log location RUN mkdir -p /opt/ats/var/log/ingress/ -FROM alpine:3.16.5 +FROM alpine:3.16.7 # essential library RUN apk add --no-cache -U \ bash \ build-base \ - curl ca-certificates \ + curl=8.4.0-r0 \ + nghttp2-libs=1.47.0-r2 \ + ca-certificates \ pcre \ zlib \ - openssl \ + openssl=1.1.1w-r1 \ brotli \ jansson \ luajit \ diff --git a/README.md b/README.md index 3ce2250..43760d7 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con - [Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md) ## Versions of Software Used -- Alpine Linux 3.16.5 -- Apache Traffic Server 9.2.0 +- Alpine Linux 3.16.7 +- Apache Traffic Server 9.2.3 - LuaJIT 2.0.4 - Go (Version can be found in `GO_VERSION` file found at the base of this repository) - Other Packages