Merge branch 'release-1.12' into chore/release-1.12.5

nginxinc · Oct 19, 2022 · cac4c09 · cac4c09
2 parents 789ef4f + 6f9c43d
commit cac4c09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1 @@
+* @nginxinc/kic
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -5,19 +5,17 @@ ARG FILES=
 ARG DEBIAN_VERSION=bullseye-slim
 
 ############################################# Base image for Debian #############################################
-FROM nginx:1.23.1 AS debian
+FROM nginx:1.23.2 AS debian
 
 RUN apt-get update \
 	&& apt-get install --no-install-recommends --no-install-suggests -y libcap2-bin \
 	&& rm -rf /var/lib/apt/lists/*
 
 
 ############################################# Base image for Alpine #############################################
-FROM nginx:1.23.1-alpine AS alpine
+FROM nginx:1.23.2-alpine AS alpine
 
-RUN apk add --no-cache libcap \
-	# temp fix for CVE-2022-40303
-	&& apk upgrade --no-cache libxml2
+RUN apk add --no-cache libcap
 
 
 ############################################# Base image for Alpine with NGINX Plus #############################################
@@ -149,7 +147,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
 
 
 ############################################# Base images containing libs for Opentracing #############################################
-FROM opentracing/nginx-opentracing:nginx-1.21.6 as opentracing-lib
+FROM opentracing/nginx-opentracing:nginx-1.23.2 as opentracing-lib
 
 
 ############################################# Build image for Debian with Opentracing #############################################