DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Final reviews on nginx v1.25 image

Browse source
This commit is contained in:
Ricardo Katz 2024-01-27 10:24:10 -03:00
parent ebd2948b07
commit 5ee3ac02dd
4 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
images/nginx-1.25/rootfs/Dockerfile
View file

@ -32,8 +32,7 @@ COPY --from=builder /usr/local /usr/local
COPY --from=builder /opt /opt COPY --from=builder /opt /opt
COPY --from=builder /etc/nginx /etc/nginx COPY --from=builder /etc/nginx /etc/nginx
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ RUN apk update \
&& apk update \
&& apk upgrade \ && apk upgrade \
&& apk add -U --no-cache \ && apk add -U --no-cache \
bash \ bash \
@ -51,8 +50,7 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/reposit
tzdata \ tzdata \
grpc-cpp \ grpc-cpp \
libprotobuf \ libprotobuf \
opentelemetry-cpp-exporter-otlp-common \ && apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/testing opentelemetry-cpp-exporter-otlp-common opentelemetry-cpp-exporter-otlp-grpc \
opentelemetry-cpp-exporter-otlp-grpc \
&& ln -s /usr/local/nginx/sbin/nginx /sbin/nginx \ && ln -s /usr/local/nginx/sbin/nginx /sbin/nginx \
&& adduser -S -D -H -u 101 -h /usr/local/nginx \ && adduser -S -D -H -u 101 -h /usr/local/nginx \
-s /sbin/nologin -G www-data -g www-data www-data \ -s /sbin/nologin -G www-data -g www-data www-data \

7
images/nginx-1.25/rootfs/build.sh
View file

@ -128,9 +128,6 @@ get_src()
rm -rf "$f" rm -rf "$f"
} }
# Enable testing/edge repo for OTEL
echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
# install required packages to build # install required packages to build
# Dependencies from "ninja" and below are OTEL dependencies # Dependencies from "ninja" and below are OTEL dependencies
apk add \ apk add \
@ -178,9 +175,9 @@ apk add \
c-ares-dev \ c-ares-dev \
re2-dev \ re2-dev \
grpc-dev \ grpc-dev \
protobuf-dev \ protobuf-dev
opentelemetry-cpp-dev
apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/testing opentelemetry-cpp-dev
# There is some bug with some platforms and git, so force HTTP/1.1 # There is some bug with some platforms and git, so force HTTP/1.1
git config --global http.version HTTP/1.1 git config --global http.version HTTP/1.1