From c375fede5b20ab3a252fcf331131268867d02977 Mon Sep 17 00:00:00 2001 From: kaiyou Date: Mon, 5 Jun 2017 12:40:41 +0200 Subject: [PATCH 1/3] Fix the nginx container build (package name changed for nginx-lua) (cherry picked from commit 4e212e3d6072b918b50be1d51f30aa93dc5dcda4) --- nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index b253ee35..15d00972 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,6 +1,6 @@ FROM nginx:alpine -RUN apk add --no-cache nginx-lua openssl +RUN apk add --no-cache nginx-mod-http-lua openssl COPY nginx.conf.default /etc/nginx/nginx.conf.default COPY nginx.conf.fallback /etc/nginx/nginx.conf.fallback From 1454ef9c9abd5fe84c03993e1297c87e7014b675 Mon Sep 17 00:00:00 2001 From: kaiyou Date: Mon, 5 Jun 2017 13:13:06 +0200 Subject: [PATCH 2/3] Properly load the nginx lua module (cherry picked from commit 4bdd8c1df5fc29e9cdd350aaaadd05daa405af73) --- nginx/nginx.conf.default | 2 ++ nginx/nginx.conf.fallback | 2 ++ 2 files changed, 4 insertions(+) diff --git a/nginx/nginx.conf.default b/nginx/nginx.conf.default index 0d57ca50..80df4402 100644 --- a/nginx/nginx.conf.default +++ b/nginx/nginx.conf.default @@ -3,6 +3,8 @@ user nginx; worker_processes 1; error_log /dev/stderr info; pid /var/run/nginx.pid; +include /etc/nginx/modules/devel_kit.conf; +include /etc/nginx/modules/http_lua.conf; events { worker_connections 1024; diff --git a/nginx/nginx.conf.fallback b/nginx/nginx.conf.fallback index bf5cd869..8d071333 100644 --- a/nginx/nginx.conf.fallback +++ b/nginx/nginx.conf.fallback @@ -3,6 +3,8 @@ user nginx; worker_processes 1; error_log /dev/stderr info; pid /var/run/nginx.pid; +include /etc/nginx/modules/devel_kit.conf; +include /etc/nginx/modules/http_lua.conf; events { worker_connections 1024; From 22e7ee9dbe09ab0f85537b5c1fe91b4e2142e374 Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Wed, 22 Mar 2017 19:26:38 +0100 Subject: [PATCH 3/3] Fix the nginx startup script (cherry picked from commit e26c6f7a6e462fd7e907494b8e68b213315cc43d) --- nginx/start.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nginx/start.sh b/nginx/start.sh index 2cb65f1a..a0f7718b 100755 --- a/nginx/start.sh +++ b/nginx/start.sh @@ -1,11 +1,10 @@ #!/bin/sh -if [[ -z ENABLE_CERTBOT || -f /certs/cert.pem ]] +if [ -z ENABLE_CERTBOT ] || [ -f /certs/cert.pem ] then cp /etc/nginx/nginx.conf.default /etc/nginx/nginx.conf else - openssl req -newkey rsa:2048 -x509 -keyout /tmp/snakeoil.pem -out /tmp/snakeoil.pem -days 365 -nodes -subj "/C=NA/ST=None/ -L=None/O=None/CN=$DOMAIN" + openssl req -newkey rsa:2048 -x509 -keyout /tmp/snakeoil.pem -out /tmp/snakeoil.pem -days 365 -nodes -subj "/C=NA/ST=None/L=None/O=None/CN=$DOMAIN" cp /etc/nginx/nginx.conf.fallback /etc/nginx/nginx.conf fi