From e59831738618b945372b6d4db72c10c02fee1ec4 Mon Sep 17 00:00:00 2001 From: Kelvin Chen Date: Fri, 7 Oct 2016 01:43:03 -0400 Subject: [PATCH] Switch frontend from old base image to alpine --- Dockerfiles/frontend/Dockerfile | 11 ++++------- Dockerfiles/frontend/common_default.conf | 5 ++++- Dockerfiles/frontend/{start => init} | 2 +- Dockerfiles/frontend/nginx.conf | 10 +++++----- Dockerfiles/frontend/ssl-gen | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) rename Dockerfiles/frontend/{start => init} (96%) diff --git a/Dockerfiles/frontend/Dockerfile b/Dockerfiles/frontend/Dockerfile index 18f172c..c2f8a16 100644 --- a/Dockerfiles/frontend/Dockerfile +++ b/Dockerfiles/frontend/Dockerfile @@ -1,10 +1,7 @@ -FROM kelvinchen/seedbox:base +FROM nginx:1.11-alpine MAINTAINER Kelvin Chen -RUN apt-get update \ - && apt-get install --no-install-recommends -y apache2-utils \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN apk add --no-cache apache2-utils openssl VOLUME /config @@ -15,7 +12,7 @@ ENV USERNAME=user \ USE_SSL=false COPY nginx.conf common_default.conf ssl.conf /etc/nginx/ -COPY start / +COPY init / COPY ssl-gen /usr/local/bin -CMD ["/start"] +CMD ["/init"] diff --git a/Dockerfiles/frontend/common_default.conf b/Dockerfiles/frontend/common_default.conf index f35ea47..d6e4bcc 100644 --- a/Dockerfiles/frontend/common_default.conf +++ b/Dockerfiles/frontend/common_default.conf @@ -3,7 +3,10 @@ listen 80; listen [::]:80; -include proxy_params; +proxy_set_header Host $http_host; +proxy_set_header X-Real-IP $remote_addr; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $http_connection; proxy_redirect off; diff --git a/Dockerfiles/frontend/start b/Dockerfiles/frontend/init similarity index 96% rename from Dockerfiles/frontend/start rename to Dockerfiles/frontend/init index 1d1cfd9..123cd10 100755 --- a/Dockerfiles/frontend/start +++ b/Dockerfiles/frontend/init @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # Make placeholder config directory mkdir -p /config/frontend diff --git a/Dockerfiles/frontend/nginx.conf b/Dockerfiles/frontend/nginx.conf index 6acd66a..5316df4 100644 --- a/Dockerfiles/frontend/nginx.conf +++ b/Dockerfiles/frontend/nginx.conf @@ -29,25 +29,25 @@ http { gzip on; gzip_disable "msie6"; - client_max_body_size 8M; + client_max_body_size 0; auth_basic "Restricted"; auth_basic_user_file .htpasswd; upstream rtorrent { - server seedbox_rtorrent_1; + server rtorrent; } upstream syncthing { - server seedbox_syncthing_1:8384; + server syncthing:8384; } upstream plex { - server seedbox_plex_1:32400; + server plex:32400; } upstream sickrage { - server seedbox_sickrage_1:8081; + server sickrage:8081; } server { diff --git a/Dockerfiles/frontend/ssl-gen b/Dockerfiles/frontend/ssl-gen index f310ac0..da2a6c1 100755 --- a/Dockerfiles/frontend/ssl-gen +++ b/Dockerfiles/frontend/ssl-gen @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # Short helper script to generate self signed SSL certificates.