Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
ciarams87 authored Mar 14, 2022
1 parent 225ab15 commit 326896c
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ RUN apt-get update \
# docker.io/library/nginx is a temporary workaround for Dependabot to see this as different from the one used in Debian
FROM docker.io/library/nginx:1.21.6-alpine AS alpine

RUN apk add --no-cache libcap
RUN apk add --no-cache libcap \
# Temp fix for CVE-2022-23308
&& apk add --no-cache libxml2~2.9.13-r0


############################################# Base image for Alpine with NGINX Plus #############################################
Expand All @@ -32,7 +34,9 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \
--mount=type=secret,id=nginx-repo.key,dst=/etc/apk/cert.key,mode=0644 \
wget -nv -O /etc/apk/keys/nginx_signing.rsa.pub https://cs.nginx.com/static/keys/nginx_signing.rsa.pub \
&& printf "%s\n" "https://pkgs.nginx.com/plus/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
&& apk add --no-cache libcap nginx-plus~${NGINX_PLUS_VERSION#r} nginx-plus-module-njs~${NGINX_PLUS_VERSION#r}
&& apk add --no-cache libcap nginx-plus~${NGINX_PLUS_VERSION#r} nginx-plus-module-njs~${NGINX_PLUS_VERSION#r} \
# Temp fix for CVE-2022-23308
&& apk add --no-cache libxml2~2.9.13-r0


############################################# Base image for Debian with NGINX Plus #############################################
Expand Down

0 comments on commit 326896c

Please sign in to comment.