Skip to content

Commit

Permalink
Updates to alpine 3.18.5 and removes explicit crypto install (#35)
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <[email protected]>
  • Loading branch information
codefromthecrypt authored Dec 2, 2023
1 parent 458b09c commit 56662a2
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# When updating, update the README and the alpine_version ARG
# * Use current version from https://alpinelinux.org/downloads/
# * ARGs repeat because Dockerfile ARGs are layer specific but will reuse the value defined here.
ARG alpine_version=3.18.2
ARG alpine_version=3.18.5

# We copy files from the context into a scratch container first to avoid a problem where docker and
# docker-compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.
Expand Down Expand Up @@ -75,8 +75,6 @@ RUN \
# * java-cacerts: implicitly gets normal ca-certs used outside Java (this does not depend on java)
# * libc6-compat: BoringSSL for Netty per https://github.com/grpc/grpc-java/blob/master/SECURITY.md#netty
apk add --no-cache java-cacerts ca-certificates libc6-compat && \
# Force install versions that don't have CVE-2023-2975. This can be removed on future versions.
apk add --no-cache libcrypto3=3.1.1-r3 libssl3=3.1.1-r3 && \
# Typically, only amd64 is tested in CI: Run a command to ensure binaries match current arch.
ldd /lib/libz.so.1

Expand Down

0 comments on commit 56662a2

Please sign in to comment.