Switch frontend from old base image to alpine

This commit is contained in:
Kelvin Chen 2016-10-07 01:43:03 -04:00
parent 2382d79fbe
commit e598317386
5 changed files with 15 additions and 15 deletions

View File

@ -1,10 +1,7 @@
FROM kelvinchen/seedbox:base FROM nginx:1.11-alpine
MAINTAINER Kelvin Chen <kelvin@kelvinchen.org> MAINTAINER Kelvin Chen <kelvin@kelvinchen.org>
RUN apt-get update \ RUN apk add --no-cache apache2-utils openssl
&& apt-get install --no-install-recommends -y apache2-utils \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
VOLUME /config VOLUME /config
@ -15,7 +12,7 @@ ENV USERNAME=user \
USE_SSL=false USE_SSL=false
COPY nginx.conf common_default.conf ssl.conf /etc/nginx/ COPY nginx.conf common_default.conf ssl.conf /etc/nginx/
COPY start / COPY init /
COPY ssl-gen /usr/local/bin COPY ssl-gen /usr/local/bin
CMD ["/start"] CMD ["/init"]

View File

@ -3,7 +3,10 @@
listen 80; listen 80;
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 Upgrade $http_upgrade;
proxy_set_header Connection $http_connection; proxy_set_header Connection $http_connection;
proxy_redirect off; proxy_redirect off;

View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env sh
# Make placeholder config directory # Make placeholder config directory
mkdir -p /config/frontend mkdir -p /config/frontend

View File

@ -29,25 +29,25 @@ http {
gzip on; gzip on;
gzip_disable "msie6"; gzip_disable "msie6";
client_max_body_size 8M; client_max_body_size 0;
auth_basic "Restricted"; auth_basic "Restricted";
auth_basic_user_file .htpasswd; auth_basic_user_file .htpasswd;
upstream rtorrent { upstream rtorrent {
server seedbox_rtorrent_1; server rtorrent;
} }
upstream syncthing { upstream syncthing {
server seedbox_syncthing_1:8384; server syncthing:8384;
} }
upstream plex { upstream plex {
server seedbox_plex_1:32400; server plex:32400;
} }
upstream sickrage { upstream sickrage {
server seedbox_sickrage_1:8081; server sickrage:8081;
} }
server { server {

View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env sh
# Short helper script to generate self signed SSL certificates. # Short helper script to generate self signed SSL certificates.