From 6343dcae5e5d6f91096dc3b30fc411c887b563f0 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 6 May 2021 13:43:56 +0200 Subject: [PATCH] add nginx --- portainer/Dockerfile | 7 +- portainer/config.json | 2 +- portainer/rootfs/etc/cont-init.d/32-nginx | 32 +++++++ .../etc/cont-init.d/90-configuration.sh | 64 ------------- .../rootfs/etc/nginx/includes/mime.types | 96 +++++++++++++++++++ .../etc/nginx/includes/proxy_params.conf | 15 +++ .../rootfs/etc/nginx/includes/resolver.conf | 1 + .../etc/nginx/includes/server_params.conf | 6 ++ .../rootfs/etc/nginx/includes/ssl_params.conf | 9 ++ .../rootfs/etc/nginx/includes/upstream.conf | 3 + portainer/rootfs/etc/nginx/nginx.conf | 56 +++++++++++ .../rootfs/etc/nginx/servers/ingress.conf | 16 ++++ portainer/rootfs/etc/services.d/nginx/finish | 8 ++ portainer/rootfs/etc/services.d/nginx/run | 9 ++ 14 files changed, 257 insertions(+), 67 deletions(-) create mode 100644 portainer/rootfs/etc/cont-init.d/32-nginx delete mode 100644 portainer/rootfs/etc/cont-init.d/90-configuration.sh create mode 100644 portainer/rootfs/etc/nginx/includes/mime.types create mode 100644 portainer/rootfs/etc/nginx/includes/proxy_params.conf create mode 100644 portainer/rootfs/etc/nginx/includes/resolver.conf create mode 100644 portainer/rootfs/etc/nginx/includes/server_params.conf create mode 100644 portainer/rootfs/etc/nginx/includes/ssl_params.conf create mode 100644 portainer/rootfs/etc/nginx/includes/upstream.conf create mode 100644 portainer/rootfs/etc/nginx/nginx.conf create mode 100644 portainer/rootfs/etc/nginx/servers/ingress.conf create mode 100644 portainer/rootfs/etc/services.d/nginx/finish create mode 100644 portainer/rootfs/etc/services.d/nginx/run diff --git a/portainer/Dockerfile b/portainer/Dockerfile index e7781bb8c..a0295d448 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -7,9 +7,12 @@ ARG BUILD_UPSTREAM="2.1.1" SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Setup base -ARG BUILD_ARCH=amd64 +ARG BUILD_ARCH RUN \ - if [ "${BUILD_ARCH}" = "aarch64" ]; then ARCH="arm64"; fi \ + apk add --no-cache \ + nginx \ + \ + && if [ "${BUILD_ARCH}" = "aarch64" ]; then ARCH="arm64"; fi \ && if [ "${BUILD_ARCH}" = "armhf" ]; then ARCH="arm"; fi \ && if [ "${BUILD_ARCH}" = "armv7" ]; then ARCH="arm"; fi \ && if [ "${BUILD_ARCH}" = "amd64" ]; then ARCH="amd64"; fi \ diff --git a/portainer/config.json b/portainer/config.json index 965d5a5ae..cf785ef08 100644 --- a/portainer/config.json +++ b/portainer/config.json @@ -6,7 +6,7 @@ "description": "Manage your Docker environment with ease", "url": "https://github.com/hassio-addons/addon-portainer", "advanced": true, - "ingress": false, + "ingress": true, "ingress_port": 1337, "startup": "services", "panel_icon": "mdi:docker", diff --git a/portainer/rootfs/etc/cont-init.d/32-nginx b/portainer/rootfs/etc/cont-init.d/32-nginx new file mode 100644 index 000000000..4204ba072 --- /dev/null +++ b/portainer/rootfs/etc/cont-init.d/32-nginx @@ -0,0 +1,32 @@ +#!/usr/bin/with-contenv bashio + +################# +# NGINX SETTING # +################# +declare port +declare certfile +declare ingress_interface +declare ingress_port +declare keyfile + +port=$(bashio::addon.port 80) +if bashio::var.has_value "${port}"; then + bashio::config.require.ssl + + if bashio::config.true 'ssl'; then + certfile=$(bashio::config 'certfile') + keyfile=$(bashio::config 'keyfile') + + mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf + sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf + sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf + + else + mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf + fi +fi + +ingress_port=$(bashio::addon.ingress_port) +ingress_interface=$(bashio::addon.ip_address) +sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf +sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf diff --git a/portainer/rootfs/etc/cont-init.d/90-configuration.sh b/portainer/rootfs/etc/cont-init.d/90-configuration.sh deleted file mode 100644 index 6cb70b78c..000000000 --- a/portainer/rootfs/etc/cont-init.d/90-configuration.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env bashio - -################## -# DEFINE OPTIONS # -################## -declare -a options -options+=(--data /data) -options+=(--bind 0.0.0.0:9000) -options+=(--templates /opt/portainer/templates.json) -options+=(--host unix:///var/run/docker.sock) - -bashio::log.info "Starting Portainer..." - -################ -# SET PASSWORD # -################ - -PASSWORD=$(bashio::config 'password') -echo -n $PASSWORD > /tmp/portainer_password -options+=(--admin-password-file /tmp/portainer_password) -bashio::log.info "... password set to $PASSWORD" - -############## -# SSL CONFIG # -############## - -bashio::config.require.ssl -if bashio::config.true 'ssl'; then - bashio::log.info "ssl enabled. If webui don't work, disable ssl or check your certificate paths" - #set variables - CERTFILE="/ssl/$(bashio::config 'certfile')" - KEYFILE="/ssl/$(bashio::config 'keyfile')" - options+=(--ssl true) - options+=(--sslcert /ssl/$CERTFILE) - options+=(--sslkey /ssl/$KEYFILE) - bashio::log.info "... ssl activated" -fi - -################### -# HIDE CONTAINERS # -################### - -# Hide Hassio containers by default, but only eforce on first run -if ! bashio::fs.file_exists "/data/hidden"; then - options+=(--hide-label io.hass.type=supervisor) - options+=(--hide-label io.hass.type=homeassistant) - options+=(--hide-label io.hass.type=base) - options+=(--hide-label io.hass.type=core) - # options+=(--hide-label io.hass.type=addon) - options+=(--hide-label io.hass.type=audio) - options+=(--hide-label io.hass.type=cli) - options+=(--hide-label io.hass.type=dns) - options+=(--hide-label io.hass.type=multicast) - options+=(--hide-label io.hass.type=observer) - bashio::log.info "... non-addon containers hidden" - touch /data/hidden -fi - -#################### -# LAUNCH PORTAINER # -#################### -bashio::log.info "... portainer launched" - -exec /opt/portainer/portainer "${options[@]}" diff --git a/portainer/rootfs/etc/nginx/includes/mime.types b/portainer/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 000000000..7c7cdef2d --- /dev/null +++ b/portainer/rootfs/etc/nginx/includes/mime.types @@ -0,0 +1,96 @@ +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/portainer/rootfs/etc/nginx/includes/proxy_params.conf b/portainer/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 000000000..1990d4959 --- /dev/null +++ b/portainer/rootfs/etc/nginx/includes/proxy_params.conf @@ -0,0 +1,15 @@ +proxy_http_version 1.1; +proxy_ignore_client_abort off; +proxy_read_timeout 86400s; +proxy_redirect off; +proxy_send_timeout 86400s; +proxy_max_temp_file_size 0; + +proxy_set_header Accept-Encoding ""; +proxy_set_header Connection $connection_upgrade; +proxy_set_header Host $http_host; +proxy_set_header Upgrade $http_upgrade; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; +proxy_set_header X-NginX-Proxy true; +proxy_set_header X-Real-IP $remote_addr; diff --git a/portainer/rootfs/etc/nginx/includes/resolver.conf b/portainer/rootfs/etc/nginx/includes/resolver.conf new file mode 100644 index 000000000..6485af141 --- /dev/null +++ b/portainer/rootfs/etc/nginx/includes/resolver.conf @@ -0,0 +1 @@ +resolver 127.0.0.11; diff --git a/portainer/rootfs/etc/nginx/includes/server_params.conf b/portainer/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 000000000..09c06543e --- /dev/null +++ b/portainer/rootfs/etc/nginx/includes/server_params.conf @@ -0,0 +1,6 @@ +root /dev/null; +server_name $hostname; + +add_header X-Content-Type-Options nosniff; +add_header X-XSS-Protection "1; mode=block"; +add_header X-Robots-Tag none; diff --git a/portainer/rootfs/etc/nginx/includes/ssl_params.conf b/portainer/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 000000000..6f1500599 --- /dev/null +++ b/portainer/rootfs/etc/nginx/includes/ssl_params.conf @@ -0,0 +1,9 @@ +ssl_protocols TLSv1.2; +ssl_prefer_server_ciphers on; +ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA; +ssl_ecdh_curve secp384r1; +ssl_session_timeout 10m; +ssl_session_cache shared:SSL:10m; +ssl_session_tickets off; +ssl_stapling on; +ssl_stapling_verify on; diff --git a/portainer/rootfs/etc/nginx/includes/upstream.conf b/portainer/rootfs/etc/nginx/includes/upstream.conf new file mode 100644 index 000000000..162402d6b --- /dev/null +++ b/portainer/rootfs/etc/nginx/includes/upstream.conf @@ -0,0 +1,3 @@ +upstream backend { + server 127.0.0.1:9000; +} diff --git a/portainer/rootfs/etc/nginx/nginx.conf b/portainer/rootfs/etc/nginx/nginx.conf new file mode 100644 index 000000000..7e5bc6f7c --- /dev/null +++ b/portainer/rootfs/etc/nginx/nginx.conf @@ -0,0 +1,56 @@ +# Run nginx in foreground. +daemon off; + +# This is run inside Docker. +user root; + +# Pid storage location. +pid /var/run/nginx.pid; + +# Set number of worker processes. +worker_processes 1; + +# Enables the use of JIT for regular expressions to speed-up their processing. +pcre_jit on; + +# Write error log to Hass.io add-on log. +error_log /proc/1/fd/1 error; + +# Load allowed environment vars +env HASSIO_TOKEN; + +# Load dynamic modules. +include /etc/nginx/modules/*.conf; + +# Max num of simultaneous connections by a worker process. +events { + worker_connections 512; +} + +http { + include /etc/nginx/includes/mime.types; + + log_format hassio '[$time_local] $status ' + '$http_x_forwarded_for($remote_addr) ' + '$request ($http_user_agent)'; + + access_log /proc/1/fd/1 hassio; + client_max_body_size 4G; + default_type application/octet-stream; + gzip on; + keepalive_timeout 65; + sendfile on; + server_tokens off; + tcp_nodelay on; + tcp_nopush on; + + map $http_upgrade $connection_upgrade { + default upgrade; + '' close; + } + + include /etc/nginx/includes/resolver.conf; + include /etc/nginx/includes/upstream.conf; + + include /etc/nginx/servers/*.conf; +} diff --git a/portainer/rootfs/etc/nginx/servers/ingress.conf b/portainer/rootfs/etc/nginx/servers/ingress.conf new file mode 100644 index 000000000..fb57f13bd --- /dev/null +++ b/portainer/rootfs/etc/nginx/servers/ingress.conf @@ -0,0 +1,16 @@ +server { + listen %%interface%%:1337 default_server; + + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + + client_max_body_size 0; + + location / { + add_header Access-Control-Allow-Origin *; + proxy_read_timeout 30; + proxy_pass http://backend/; + } + + +} diff --git a/portainer/rootfs/etc/services.d/nginx/finish b/portainer/rootfs/etc/services.d/nginx/finish new file mode 100644 index 000000000..444240135 --- /dev/null +++ b/portainer/rootfs/etc/services.d/nginx/finish @@ -0,0 +1,8 @@ +#!/usr/bin/execlineb -S0 +# ============================================================================== +# Take down the S6 supervision tree when Nginx fails +# ============================================================================== +if { s6-test ${1} -ne 0 } +if { s6-test ${1} -ne 256 } + +s6-svscanctl -t /var/run/s6/services diff --git a/portainer/rootfs/etc/services.d/nginx/run b/portainer/rootfs/etc/services.d/nginx/run new file mode 100644 index 000000000..daf56fe17 --- /dev/null +++ b/portainer/rootfs/etc/services.d/nginx/run @@ -0,0 +1,9 @@ +#!/usr/bin/with-contenv bashio +# ============================================================================== + +# Wait for transmission to become available +bashio::net.wait_for 8080 localhost 900 + +bashio::log.info "Starting NGinx..." + +exec nginx