From 1b63174d5dbed2f35841117c90a28ea2fb38569e Mon Sep 17 00:00:00 2001 From: Nicolas Favre-Felix Date: Sun, 5 Feb 2023 10:32:42 -0800 Subject: [PATCH] Dependency updates: alpine, redis, ssl Alpine: 3.14.3 -> 3.17.1 Redis: 6.2.6 -> 7.0.8 --- Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d77b5ee..e238eb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14.3 AS stage +FROM alpine:3.17.1 AS stage LABEL maintainer="Nicolas Favre-Felix " RUN apk update && apk add wget make gcc libevent-dev msgpack-c-dev musl-dev openssl-dev bsd-compat-headers jq @@ -9,9 +9,12 @@ RUN cd webdis-$(cat latest) && make && make install && make clean && make SSL=1 RUN sed -i -e 's/"daemonize":.*true,/"daemonize": false,/g' /etc/webdis.prod.json # main image -FROM alpine:3.14.3 +FROM alpine:3.17.1 # Required dependencies, with versions fixing known security vulnerabilities -RUN apk update && apk add libevent msgpack-c 'redis>6.2.6' openssl libssl1.1 libcrypto1.1 && rm -f /var/cache/apk/* /usr/bin/redis-benchmark /usr/bin/redis-cli +RUN apk update && apk add libevent msgpack-c openssl \ + 'redis>=6.2.10' 'libssl3>=3.0.8-r0' 'libcrypto3>=3.0.8-r1' \ + 'libssl1.1' 'libcrypto1.1>=1.1.1t-r0' && \ + rm -f /var/cache/apk/* /usr/bin/redis-benchmark /usr/bin/redis-cli COPY --from=stage /usr/local/bin/webdis /usr/local/bin/webdis-ssl /usr/local/bin/ COPY --from=stage /etc/webdis.prod.json /etc/webdis.prod.json RUN echo "daemonize yes" >> /etc/redis.conf