Skip to content

Commit d3e7725

Browse files
authored
Remove libcap (#3616)
libcap is no longer needed so we don't need to install it anymore. This also removes temporary fixes for CVEs.
1 parent 7e7c824 commit d3e7725

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

build/Dockerfile

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@ FROM opentracing/nginx-opentracing:nginx-1.23.3-alpine as alpine-opentracing-lib
1313
FROM nginx:1.23.3 AS debian
1414

1515
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/ \
2217
&& cp -av /tmp/ot/usr/lib/nginx/modules/ngx_http_opentracing_module.so /usr/lib/nginx/modules/ \
2318
&& ldconfig
2419

@@ -27,7 +22,7 @@ RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \
2722
FROM nginx:1.23.3-alpine AS alpine
2823

2924
RUN --mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
30-
apk add --no-cache libcap libstdc++ \
25+
apk add --no-cache libstdc++ \
3126
# temp fix for CVE-2023-23916
3227
&& apk upgrade --no-cache curl libcurl \
3328
&& 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 \
4439
--mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
4540
wget -nv -O /etc/apk/keys/nginx_signing.rsa.pub https://cs.nginx.com/static/keys/nginx_signing.rsa.pub \
4641
&& 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 \
4843
&& 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/ \
4944
&& ldconfig /usr/local/lib/
5045

@@ -60,16 +55,14 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
6055
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
6156
--mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \
6257
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 \
6459
&& curl -fsSL https://cs.nginx.com/static/keys/nginx_signing.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nginx_signing.gpg \
6560
&& curl -fsSL -o /etc/apt/apt.conf.d/90pkgs-nginx https://cs.nginx.com/static/files/90pkgs-nginx \
6661
&& DEBIAN_VERSION=$(awk -F '=' '/^VERSION_CODENAME=/ {print $2}' /etc/os-release) \
6762
&& 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 \
6863
&& 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 \
6964
&& apt-get update \
7065
&& 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 \
7366
&& apt-get purge --auto-remove -y apt-transport-https gnupg curl \
7467
&& 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/ \
7568
&& ldconfig \

0 commit comments

Comments
 (0)