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

Correct Nginx and Alpine version in legacy branch (#7736)

Browse source
This commit is contained in:
Rushank Jhanjaria 2021-10-03 13:57:06 -07:00 committed by GitHub
parent 23fa7c0450
commit 25b87436f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
images/nginx/rootfs/Dockerfile
View file

@ -13,7 +13,7 @@
# limitations under the License.
FROM alpine:3.13 as builder
FROM alpine:3.14.2 as builder
COPY . /
@ -23,7 +23,7 @@ RUN apk update \
&& /build.sh
# Use a multi-stage build
FROM alpine:3.13
FROM alpine:3.14.2
ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin

4
images/nginx/rootfs/build.sh
View file

@ -18,7 +18,7 @@ set -o errexit
set -o nounset
set -o pipefail
export NGINX_VERSION=1.20.1
export NGINX_VERSION=1.19.9
# Check for recent changes: https://github.com/vision5/ngx_devel_kit/compare/v0.3.1...master
export NDK_VERSION=0.3.1
@ -190,7 +190,7 @@ mkdir --verbose -p "$BUILD_PATH"
cd "$BUILD_PATH"
# download, verify and extract the source files
get_src e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49 \
get_src 2e35dff06a9826e8aca940e9e8be46b7e4b12c19a48d55bfc2dc28fc9cc7d841 \
"https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
get_src 0e971105e210d272a497567fa2e2c256f4e39b845a5ba80d373e26ba1abfbd85 \