Upgrade to alpine linux 3.14.7 (#136)
diff --git a/Dockerfile b/Dockerfile
index 15ec4b8..a95b1f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,15 +15,14 @@
# limitations under the License.
#
-FROM alpine:3.14.6 as builder
+FROM alpine:3.14.7 as builder
RUN apk add --no-cache --virtual .tools \
- bzip2 curl git automake libtool autoconf make sed file perl openrc openssl=1.1.1q-r0 \
- libssl1.1=1.1.1q-r0 libcrypto1.1=1.1.1q-r0
+ bzip2 curl git automake libtool autoconf make sed file perl openrc openssl
# ATS dependencies
RUN apk add --no-cache --virtual .ats-build-deps \
- build-base openssl-dev=1.1.1q-r0 tcl-dev pcre-dev zlib-dev \
+ build-base openssl-dev tcl-dev pcre-dev zlib-dev \
libexecinfo-dev linux-headers libunwind-dev \
brotli-dev jansson-dev luajit-dev readline-dev geoip-dev
@@ -68,7 +67,7 @@
# ingress-ats
RUN apk add --no-cache --virtual .ingress-build-deps \
- bash gcc musl-dev openssl=1.1.1q-r0 libssl1.1=1.1.1q-r0 libcrypto1.1=1.1.1q-r0 go
+ bash gcc musl-dev openssl go
# Installing Golang https://github.com/CentOS/CentOS-Dockerfiles/blob/master/golang/centos7/Dockerfile
COPY GO_VERSION /
@@ -119,7 +118,7 @@
# set up ingress log location
RUN mkdir -p /opt/ats/var/log/ingress/
-FROM alpine:3.14.6
+FROM alpine:3.14.7
# essential library
RUN apk add --no-cache -U \
@@ -128,9 +127,7 @@
curl ca-certificates \
pcre \
zlib \
- openssl=1.1.1q-r0 \
- libssl1.1=1.1.1q-r0 \
- libcrypto1.1=1.1.1q-r0 \
+ openssl \
brotli \
jansson \
luajit \
diff --git a/README.md b/README.md
index c4f37e6..3521eea 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@
- [Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md)
## Versions of Software Used
-- Alpine Linux 3.14.6
+- Alpine Linux 3.14.7
- Apache Traffic Server 9.1.2
- LuaJIT 2.0.4
- Go (Version can be found in `GO_VERSION` file found at the base of this repository)
