Skip to content

Commit

Permalink
Bump version to v1.22.0 (#32)
Browse files Browse the repository at this point in the history
  • Loading branch information
levonet authored Jun 1, 2022
1 parent a844eaa commit 056eace
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
13 changes: 8 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM alpine:3.15 AS build

ENV NGINX_VERSION 1.21.6
ENV NGINX_VERSION 1.22.0
# https://github.com/nginx/njs
ENV NJS_MODULE_VERSION 0.7.2
ENV NJS_MODULE_VERSION 0.7.4
# https://github.com/openresty/echo-nginx-module
ENV ECHO_MODULE_VERSION v0.62
# https://github.com/openresty/headers-more-nginx-module
Expand Down Expand Up @@ -31,7 +31,7 @@ ENV JAEGER_CLIENT_VERSION v0.9.0
# https://github.com/opentracing/opentracing-cpp
ENV OPENTRACING_LIB_VERSION v1.6.0
# https://github.com/opentracing-contrib/nginx-opentracing
ENV OPENTRACING_MODULE_VERSION v0.23.0
ENV OPENTRACING_MODULE_VERSION v0.24.0

COPY *.patch /tmp/
RUN set -eux \
Expand All @@ -55,6 +55,8 @@ RUN set -eux \
postgresql-dev \
readline-dev \
zlib-dev \
# https://nginx.org/en/pgp_keys.html
&& curl -fSL https://nginx.org/keys/thresh.key -o nginx_signing.key \
&& curl -fSL https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz -o nginx.tar.gz \
&& curl -fSL https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz.asc -o nginx.tar.gz.asc \
&& export GNUPGHOME="$(mktemp -d)" \
Expand All @@ -69,8 +71,9 @@ RUN set -eux \
gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$GPG_KEYS" && found=yes && break; \
done; \
test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
&& rm -rf "$GNUPGHOME" nginx.tar.gz.asc \
gpg --import nginx_signing.key \
&& gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
&& rm -rf "$GNUPGHOME" nginx_signing.key nginx.tar.gz.asc \
&& mkdir -p /usr/src \
&& tar -zxC /usr/src -f nginx.tar.gz \
&& rm nginx.tar.gz \
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

- [`latest` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/master/Dockerfile)
- [`1.21.6-alpine`, `1.21-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.21.6/Dockerfile) Mainline version
- [`1.20.1-alpine`, `1.20-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.20.1/Dockerfile) Stable version
- [`1.22.0-alpine`, `1.22-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.22.0/Dockerfile) Stable version
- <details><summary>Older versions</summary>

- [`1.20.1-alpine`, `1.20-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.20.1/Dockerfile)
- [`1.19.10-alpine`, `1.19-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.19.10/Dockerfile)
- [`1.18.0-alpine`, `1.18-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.18.0/Dockerfile)
- [`1.17.10-alpine`, `1.17-alpine` (*Dockerfile*)](https://github.com/levonet/docker-nginx/blob/v1.17.10/Dockerfile)
Expand Down

0 comments on commit 056eace

Please sign in to comment.