@@ -13,12 +13,7 @@ FROM opentracing/nginx-opentracing:nginx-1.23.3-alpine as alpine-opentracing-lib
13
13
FROM nginx:1.23.3 AS debian
14
14
15
15
RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \
16
- apt-get update \
17
- && apt-get install --no-install-recommends --no-install-suggests -y libcap2-bin \
18
- # temp fix for CVE-2023-0361, CVE-2023-0795 and CVE-2023-23916
19
- && apt-get install -y libgnutls30 libtiff5 curl \
20
- && rm -rf /var/lib/apt/lists/* \
21
- && cp -av /tmp/ot/usr/local/lib/libopentracing.so* /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
16
+ cp -av /tmp/ot/usr/local/lib/libopentracing.so* /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
22
17
&& cp -av /tmp/ot/usr/lib/nginx/modules/ngx_http_opentracing_module.so /usr/lib/nginx/modules/ \
23
18
&& ldconfig
24
19
@@ -27,7 +22,7 @@ RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \
27
22
FROM nginx:1.23.3-alpine AS alpine
28
23
29
24
RUN --mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
30
- apk add --no-cache libcap libstdc++ \
25
+ apk add --no-cache libstdc++ \
31
26
# temp fix for CVE-2023-23916
32
27
&& apk upgrade --no-cache curl libcurl \
33
28
&& cp -av /tmp/ot/usr/local/lib/libopentracing.so* /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
@@ -44,7 +39,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \
44
39
--mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
45
40
wget -nv -O /etc/apk/keys/nginx_signing.rsa.pub https://cs.nginx.com/static/keys/nginx_signing.rsa.pub \
46
41
&& printf "%s\n " "https://pkgs.nginx.com/plus/${NGINX_PLUS_VERSION}/alpine/v$(grep -E -o '^[0-9]+\. [0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
47
- && apk add --no-cache libcap nginx-plus nginx-plus-module-njs nginx-plus-module-opentracing libcurl \
42
+ && apk add --no-cache nginx-plus nginx-plus-module-njs nginx-plus-module-opentracing libcurl \
48
43
&& cp -av /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
49
44
&& ldconfig /usr/local/lib/
50
45
@@ -60,16 +55,14 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
60
55
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
61
56
--mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \
62
57
apt-get update \
63
- && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg curl apt-transport-https libcap2-bin \
58
+ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg curl apt-transport-https \
64
59
&& curl -fsSL https://cs.nginx.com/static/keys/nginx_signing.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nginx_signing.gpg \
65
60
&& curl -fsSL -o /etc/apt/apt.conf.d/90pkgs-nginx https://cs.nginx.com/static/files/90pkgs-nginx \
66
61
&& DEBIAN_VERSION=$(awk -F '=' '/^VERSION_CODENAME=/ {print $2}' /etc/os-release) \
67
62
&& printf "%s\n " "Acquire::https::pkgs.nginx.com::User-Agent \" k8s-ic-$IC_VERSION${BUILD_OS##debian-plus}-apt\" ;" >> /etc/apt/apt.conf.d/90pkgs-nginx \
68
63
&& printf "%s\n " "deb https://pkgs.nginx.com/plus/${NGINX_PLUS_VERSION}/debian ${DEBIAN_VERSION} nginx-plus" > /etc/apt/sources.list.d/nginx-plus.list \
69
64
&& apt-get update \
70
65
&& apt-get install --no-install-recommends --no-install-suggests -y nginx-plus nginx-plus-module-njs nginx-plus-module-opentracing libcurl4 \
71
- # temp fix for CVE-2023-0361
72
- && apt-get install -y libgnutls30 \
73
66
&& apt-get purge --auto-remove -y apt-transport-https gnupg curl \
74
67
&& cp -av /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
75
68
&& ldconfig \
0 commit comments