From ba55d1a0b6236e97218a1ed79dfa19a2633e56cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Do=CC=88ring?= Date: Thu, 1 Sep 2016 17:29:25 +0200 Subject: [PATCH 1/3] Add alpine base image - Inspired by #408 - Possible solution for #543 --- Dockerfile.alpine | 31 +++++++++++++++++++++++++++++++ Makefile | 8 +++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Dockerfile.alpine diff --git a/Dockerfile.alpine b/Dockerfile.alpine new file mode 100644 index 0000000..5dfcdee --- /dev/null +++ b/Dockerfile.alpine @@ -0,0 +1,31 @@ +FROM nginx:1.11.3-alpine +MAINTAINER Jason Wilder mail@jasonwilder.com + +# Install wget and install/updates certificates +RUN apk add --no-cache --virtual .run-deps \ + ca-certificates bash wget \ + && update-ca-certificates + +# Configure Nginx and apply fix for very long server names +RUN echo "daemon off;" >> /etc/nginx/nginx.conf \ + && sed -i 's/^http {/&\n server_names_hash_bucket_size 128;/g' /etc/nginx/nginx.conf + +# Install Forego +ADD https://github.com/jwilder/forego/releases/download/v0.16.1/forego /usr/local/bin/forego +RUN chmod u+x /usr/local/bin/forego + +ENV DOCKER_GEN_VERSION 0.7.3 + +RUN wget --quiet https://github.com/jwilder/docker-gen/releases/download/$DOCKER_GEN_VERSION/docker-gen-alpine-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \ + && tar -C /usr/local/bin -xvzf docker-gen-alpine-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \ + && rm /docker-gen-alpine-linux-amd64-$DOCKER_GEN_VERSION.tar.gz + +COPY . /app/ +WORKDIR /app/ + +ENV DOCKER_HOST unix:///tmp/docker.sock + +VOLUME ["/etc/nginx/certs"] + +ENTRYPOINT ["/app/docker-entrypoint.sh"] +CMD ["forego", "start", "-r"] diff --git a/Makefile b/Makefile index 74ae6bf..1a50fbd 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,12 @@ update-dependencies: docker pull appropriate/curl:latest docker pull docker:1.10 -test: +test-debian: docker build -t jwilder/nginx-proxy:bats . bats test + +test-alpine: + docker build -f Dockerfile.alpine -t jwilder/nginx-proxy:bats . + bats test + +test: test-debian test-alpine From 7d05f0d924ac8e59dadfaa0d4e99a08e7e2a4f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6ring?= Date: Sat, 3 Sep 2016 12:05:27 +0200 Subject: [PATCH 2/3] Add nginx alpine to update-dependencies task --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 1a50fbd..0e802b3 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ update-dependencies: docker pull jwilder/docker-gen:0.7.3 docker pull nginx:1.11.3 + docker pull nginx:1.11.3-alpine docker pull python:3 docker pull rancher/socat-docker:latest docker pull appropriate/curl:latest From c1d93d112a7720fd3c13e3087e199ad056aa2ef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20D=C3=B6ring?= Date: Thu, 29 Dec 2016 00:18:06 +0100 Subject: [PATCH 3/3] Upgrade nginx-alpine to 1.11.8 --- Dockerfile.alpine | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 5dfcdee..4ce9561 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM nginx:1.11.3-alpine +FROM nginx:1.11.8-alpine MAINTAINER Jason Wilder mail@jasonwilder.com # Install wget and install/updates certificates diff --git a/Makefile b/Makefile index 0e802b3..acb3386 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,8 @@ update-dependencies: docker pull jwilder/docker-gen:0.7.3 - docker pull nginx:1.11.3 - docker pull nginx:1.11.3-alpine + docker pull nginx:1.11.6 + docker pull nginx:1.11.8-alpine docker pull python:3 docker pull rancher/socat-docker:latest docker pull appropriate/curl:latest