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

Release nginx-slim 0.17

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-05-17 11:22:11 -04:00
parent c831359733
commit b72ee2479e
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
images/nginx-slim/Makefile
View file

@ -15,7 +15,7 @@
all: push
# 0.0.0 shouldn't clobber any released builds
TAG = 0.16
TAG = 0.17
REGISTRY = gcr.io/google_containers
ARCH ?= $(shell go env GOARCH)
QEMUVERSION=v2.7.0
@ -25,7 +25,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
# Set default base image dynamically for each arch
BASEIMAGE?=gcr.io/google_containers/ubuntu-slim-$(ARCH):0.9
BASEIMAGE?=gcr.io/google_containers/ubuntu-slim-$(ARCH):0.10
ifeq ($(ARCH),arm)
QEMUARCH=arm

16
images/nginx-slim/build.sh
View file

@ -17,11 +17,11 @@
set -e
export NGINX_VERSION=1.11.12
export NGINX_VERSION=1.13.0
export NDK_VERSION=0.3.0
export VTS_VERSION=0.1.14
export SETMISC_VERSION=0.31
export LUA_VERSION=0.10.7
export LUA_VERSION=0.10.8
export STICKY_SESSIONS_VERSION=08a395c66e42
export LUA_CJSON_VERSION=2.1.0.4
export LUA_RESTY_HTTP_VERSION=0.07
@ -77,7 +77,7 @@ apt-get update && apt-get install --no-install-recommends -y \
linux-headers-generic || exit 1
# download, verify and extract the source files
get_src 2aff7f9396d1f77256efc363e1cc05ba52d40a29e6de4d9bc08aa444eea14122 \
get_src 79f52ab6550f854e14439369808105b5780079769d7b8db3856be03c683605d7 \
"http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
get_src 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 \
@ -89,7 +89,7 @@ get_src 97946a68937b50ab8637e1a90a13198fe376d801dc3e7447052e43c28e9ee7de \
get_src e3b0018959ac899b73d3843e07351023f02be0ff421214426e3fe32193138963 \
"https://github.com/vozlt/nginx-module-vts/archive/v$VTS_VERSION.tar.gz"
get_src c21c8937dcdd6fc2b6a955f929e3f4d1388610f47180e60126e6dcab06786f77 \
get_src d67449c71051b3cc2d6dd60df0ae0d21fca08aa19c9b30c5b95ee21ff38ef8dd \
"https://github.com/openresty/lua-nginx-module/archive/v$LUA_VERSION.tar.gz"
get_src 5417991b6db4d46383da2d18f2fd46b93fafcebfe87ba87f7cfeac4c9bcb0224 \
@ -117,10 +117,10 @@ get_src 8eabbcd5950fdcc718bb0ef9165206c2ed60f67cd9da553d7bc3e6fe4e338461 \
#https://blog.cloudflare.com/optimizing-tls-over-tcp-to-reduce-latency/
curl -sSL -o nginx__dynamic_tls_records.patch https://raw.githubusercontent.com/cloudflare/sslconfig/master/patches/nginx__1.11.5_dynamic_tls_records.patch
# https://github.com/openresty/lua-nginx-module/issues/1016
curl -sSL -o patch-src-ngx_http_lua_headers.c.diff https://raw.githubusercontent.com/macports/macports-ports/master/www/nginx/files/patch-src-ngx_http_lua_headers.c.diff
cd "$BUILD_PATH/lua-nginx-module-$LUA_VERSION"
patch -p1 < $BUILD_PATH/patch-src-ngx_http_lua_headers.c.diff
# https://github.com/openresty/lua-nginx-module/issues/1016
curl -sSL -o patch-src-ngx_http_lua_headers.c.diff https://raw.githubusercontent.com/macports/macports-ports/master/www/nginx/files/patch-src-ngx_http_lua_headers.c.diff
cd "$BUILD_PATH/lua-nginx-module-$LUA_VERSION"
patch -p1 < $BUILD_PATH/patch-src-ngx_http_lua_headers.c.diff
# build nginx
cd "$BUILD_PATH/nginx-$NGINX_VERSION"