Skip to content

Commit 56fdd06

Browse files
joshperryjoshperry
committed
Merge upstream changes
2 parents 2b710d2 + ddbbbdf commit 56fdd06

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

‎generate-stackbrew-library.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -eu
33

44
declare -A aliases
55
aliases=(
6-
[mainline]='1 1.13 latest'
7-
[stable]='1.12'
6+
[mainline]='1 1.15 latest'
7+
[stable]='1.14'
88
)
99

1010
self="$(basename "$BASH_SOURCE")"

‎mainline/alpine-perl/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM alpine:3.7
22

33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

5-
ENV NGINX_VERSION 1.13.8
5+
ENV NGINX_VERSION 1.15.2
66

77
RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
88
&& CONFIG="\
@@ -82,7 +82,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
8282
done; \
8383
test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
8484
gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
85-
&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
85+
&& rm -rf "$GNUPGHOME" nginx.tar.gz.asc \
8686
&& mkdir -p /usr/src \
8787
&& tar -zxC /usr/src -f nginx.tar.gz \
8888
&& rm nginx.tar.gz \

‎mainline/alpine/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM alpine:3.7
22

33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

5-
ENV NGINX_VERSION 1.13.8
5+
ENV NGINX_VERSION 1.15.2
66

77
RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
88
&& CONFIG="\
@@ -82,7 +82,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
8282
done; \
8383
test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
8484
gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
85-
&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
85+
&& rm -rf "$GNUPGHOME" nginx.tar.gz.asc \
8686
&& mkdir -p /usr/src \
8787
&& tar -zxC /usr/src -f nginx.tar.gz \
8888
&& rm nginx.tar.gz \

‎mainline/stretch-perl/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM debian:stretch-slim
22

33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

5-
ENV NGINX_VERSION 1.13.8-1~stretch
6-
ENV NJS_VERSION 1.13.8.0.1.15-1~stretch
5+
ENV NGINX_VERSION 1.15.2-1~stretch
6+
ENV NJS_VERSION 1.15.2.0.2.2-1~stretch
77

88
RUN set -x \
99
&& apt-get update \
@@ -40,7 +40,7 @@ RUN set -x \
4040
*) \
4141
# we're on an architecture upstream doesn't officially build for
4242
# let's build binaries from the published source packages
43-
echo "deb-src https://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list/nginx.list \
43+
echo "deb-src https://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list.d/nginx.list \
4444
\
4545
# new directory for storing sources and .deb files
4646
&& tempDir="$(mktemp -d)" \
@@ -81,7 +81,7 @@ RUN set -x \
8181
&& apt-get install --no-install-recommends --no-install-suggests -y \
8282
$nginxPackages \
8383
gettext-base \
84-
&& apt-get remove --purge --auto-remove -y apt-transport-https ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list/nginx.list \
84+
&& apt-get remove --purge --auto-remove -y apt-transport-https ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
8585
\
8686
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
8787
&& if [ -n "$tempDir" ]; then \

‎mainline/stretch/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM debian:stretch-slim
22

33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

5-
ENV NGINX_VERSION 1.13.8-1~stretch
6-
ENV NJS_VERSION 1.13.8.0.1.15-1~stretch
5+
ENV NGINX_VERSION 1.15.2-1~stretch
6+
ENV NJS_VERSION 1.15.2.0.2.2-1~stretch
77

88
RUN set -x \
99
&& apt-get update \
@@ -39,7 +39,7 @@ RUN set -x \
3939
*) \
4040
# we're on an architecture upstream doesn't officially build for
4141
# let's build binaries from the published source packages
42-
echo "deb-src https://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list/nginx.list \
42+
echo "deb-src https://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list.d/nginx.list \
4343
\
4444
# new directory for storing sources and .deb files
4545
&& tempDir="$(mktemp -d)" \
@@ -80,7 +80,7 @@ RUN set -x \
8080
&& apt-get install --no-install-recommends --no-install-suggests -y \
8181
$nginxPackages \
8282
gettext-base \
83-
&& apt-get remove --purge --auto-remove -y apt-transport-https ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list/nginx.list \
83+
&& apt-get remove --purge --auto-remove -y apt-transport-https ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
8484
\
8585
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
8686
&& if [ -n "$tempDir" ]; then \

‎stable/alpine-perl/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM alpine:3.7
22

33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

5-
ENV NGINX_VERSION 1.12.2
5+
ENV NGINX_VERSION 1.14.0
66

77
RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
88
&& CONFIG="\
@@ -82,7 +82,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
8282
done; \
8383
test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
8484
gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
85-
&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
85+
&& rm -rf "$GNUPGHOME" nginx.tar.gz.asc \
8686
&& mkdir -p /usr/src \
8787
&& tar -zxC /usr/src -f nginx.tar.gz \
8888
&& rm nginx.tar.gz \

‎stable/alpine/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM alpine:3.7
22

33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

5-
ENV NGINX_VERSION 1.12.2
5+
ENV NGINX_VERSION 1.14.0
66

77
RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
88
&& CONFIG="\
@@ -80,7 +80,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
8080
done; \
8181
test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
8282
gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
83-
&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
83+
&& rm -rf "$GNUPGHOME" nginx.tar.gz.asc \
8484
&& mkdir -p /usr/src \
8585
&& tar -zxC /usr/src -f nginx.tar.gz \
8686
&& rm nginx.tar.gz \

‎stable/stretch-perl/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM debian:stretch-slim
22

33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

5-
ENV NGINX_VERSION 1.12.2-1~stretch
6-
ENV NJS_VERSION 1.12.2.0.1.14-1~stretch
5+
ENV NGINX_VERSION 1.14.0-1~stretch
6+
ENV NJS_VERSION 1.14.0.0.2.0-1~stretch
77

88
RUN set -x \
99
&& apt-get update \

‎stable/stretch/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM debian:stretch-slim
22

33
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
44

5-
ENV NGINX_VERSION 1.12.2-1~stretch
6-
ENV NJS_VERSION 1.12.2.0.1.14-1~stretch
5+
ENV NGINX_VERSION 1.14.0-1~stretch
6+
ENV NJS_VERSION 1.14.0.0.2.0-1~stretch
77

88
RUN set -x \
99
&& apt-get update \

0 commit comments

Comments
 (0)