Skip to content

Commit 914af51

Browse files
committed
Regenerated after last commits.
1 parent 436c6e3 commit 914af51

30 files changed

+20
-2312
lines changed

mainline/alpine-perl/10-listen-on-ipv6-by-default.sh

Lines changed: 0 additions & 67 deletions
This file was deleted.

mainline/alpine-perl/20-envsubst-on-templates.sh

Lines changed: 0 additions & 39 deletions
This file was deleted.

mainline/alpine-perl/30-tune-worker-processes.sh

Lines changed: 0 additions & 188 deletions
This file was deleted.

mainline/alpine-perl/Dockerfile

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,9 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM alpine:3.17
7-
8-
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
9-
10-
ENV NGINX_VERSION 1.23.2
11-
ENV NJS_VERSION 0.7.7
12-
ENV PKG_RELEASE 1
6+
FROM nginx:1.23.2-alpine
137

148
RUN set -x \
15-
# create nginx user/group first, to be consistent throughout docker variants
16-
&& addgroup -g 101 -S nginx \
17-
&& adduser -S -D -H -u 101 -h /var/cache/nginx -s /sbin/nologin -G nginx -g nginx nginx \
189
&& apkArch="$(cat /etc/apk/arch)" \
1910
&& nginxPackages=" \
2011
nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
@@ -56,11 +47,7 @@ RUN set -x \
5647
pcre2-dev \
5748
zlib-dev \
5849
linux-headers \
59-
libxslt-dev \
60-
gd-dev \
61-
geoip-dev \
6250
perl-dev \
63-
libedit-dev \
6451
bash \
6552
alpine-sdk \
6653
findutils \
@@ -78,7 +65,7 @@ RUN set -x \
7865
&& tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
7966
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
8067
&& cd alpine \
81-
&& make all \
68+
&& make module-perl \
8269
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
8370
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
8471
" \
@@ -92,43 +79,4 @@ RUN set -x \
9279
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
9380
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
9481
&& if [ -n "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
95-
&& if [ -n "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi \
96-
# Bring in gettext so we can get `envsubst`, then throw
97-
# the rest away. To do this, we need to install `gettext`
98-
# then move `envsubst` out of the way so `gettext` can
99-
# be deleted completely, then move `envsubst` back.
100-
&& apk add --no-cache --virtual .gettext gettext \
101-
&& mv /usr/bin/envsubst /tmp/ \
102-
\
103-
&& runDeps="$( \
104-
scanelf --needed --nobanner /tmp/envsubst \
105-
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
106-
| sort -u \
107-
| xargs -r apk info --installed \
108-
| sort -u \
109-
)" \
110-
&& apk add --no-cache $runDeps \
111-
&& apk del .gettext \
112-
&& mv /tmp/envsubst /usr/local/bin/ \
113-
# Bring in tzdata so users could set the timezones through the environment
114-
# variables
115-
&& apk add --no-cache tzdata \
116-
# Bring in curl and ca-certificates to make registering on DNS SD easier
117-
&& apk add --no-cache curl ca-certificates \
118-
# forward request and error logs to docker log collector
119-
&& ln -sf /dev/stdout /var/log/nginx/access.log \
120-
&& ln -sf /dev/stderr /var/log/nginx/error.log \
121-
# create a docker-entrypoint.d directory
122-
&& mkdir /docker-entrypoint.d
123-
124-
COPY docker-entrypoint.sh /
125-
COPY 10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
126-
COPY 20-envsubst-on-templates.sh /docker-entrypoint.d
127-
COPY 30-tune-worker-processes.sh /docker-entrypoint.d
128-
ENTRYPOINT ["/docker-entrypoint.sh"]
129-
130-
EXPOSE 80
131-
132-
STOPSIGNAL SIGQUIT
133-
134-
CMD ["nginx", "-g", "daemon off;"]
82+
&& if [ -n "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi

0 commit comments

Comments
 (0)