Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nginx to latest stable #725

Merged
merged 8 commits into from
Feb 18, 2020
Merged

Update nginx to latest stable #725

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8c84177
update nginx to latest stable
jschaul Apr 23, 2019
fb1d45e
update to 1.16.1 and latest alpine
jschaul Feb 18, 2020
4538bca
WIP: mirror upstream and comment which sections are different
jschaul Feb 18, 2020
37a41d3
back to alpine 3.10 as 3.11 doesn't seem supported yet
jschaul Feb 18, 2020
c4983d9
local test make target to check nginx start sup with the example config
jschaul Feb 18, 2020
7ae92eb
new makefile target
jschaul Feb 18, 2020
7e3dd20
back to previous version of compilation; upgrading to latest doesn't …
jschaul Feb 18, 2020
0f255bc
alpine 3.11
jschaul Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/nginz/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN cd /src/libzauth/libzauth-c \
# Nginz container
FROM alpine:3.8

ENV NGINX_VERSION 1.14.2
ENV NGINX_VERSION 1.16.0

# Install libzauth
COPY --from=libzauth-builder /usr/local/include/zauth.h /usr/local/include/zauth.h
Expand Down
2 changes: 1 addition & 1 deletion services/nginz/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
LANG := en_US.UTF-8
SHELL := /usr/bin/env bash
NAME := nginz
NGINX_VERSION = 1.14.2
NGINX_VERSION = 1.16.0
NGINZ_VERSION ?=
SWAGGER_VERSION:= 2.2.10
ARCH := $(shell if [ -f "`which dpkg-architecture`" ]; then dpkg-architecture -qDEB_HOST_ARCH; else [ -f "`which dpkg`" ] && dpkg --print-architecture; fi )
Expand Down