From b5da6c31e9bc1767de7f3a35c42d4480eef16dd5 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 2 Aug 2021 11:25:58 +0200 Subject: [PATCH] ingress test --- cloudcommander/Dockerfile | 12 ++- cloudcommander/config.json | 3 + .../rootfs/etc/nginx/includes/mime.types | 96 +++++++++++++++++++ .../etc/nginx/includes/proxy_params.conf | 16 ++++ .../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 + cloudcommander/rootfs/etc/nginx/nginx.conf | 56 +++++++++++ .../rootfs/etc/nginx/servers/ingress.conf | 17 ++++ cloudcommander/{ => rootfs}/run.sh | 6 +- filebrowser/rootfs/run.sh | 5 +- 12 files changed, 221 insertions(+), 9 deletions(-) create mode 100644 cloudcommander/rootfs/etc/nginx/includes/mime.types create mode 100644 cloudcommander/rootfs/etc/nginx/includes/proxy_params.conf create mode 100644 cloudcommander/rootfs/etc/nginx/includes/resolver.conf create mode 100644 cloudcommander/rootfs/etc/nginx/includes/server_params.conf create mode 100644 cloudcommander/rootfs/etc/nginx/includes/ssl_params.conf create mode 100644 cloudcommander/rootfs/etc/nginx/includes/upstream.conf create mode 100644 cloudcommander/rootfs/etc/nginx/nginx.conf create mode 100644 cloudcommander/rootfs/etc/nginx/servers/ingress.conf rename cloudcommander/{ => rootfs}/run.sh (97%) diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index 14c3ea483..cbf9bd2ed 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -1,7 +1,8 @@ ARG BUILD_VERSION FROM coderaiser/cloudcmd:latest -COPY run.sh / +# Copy root filesystem +COPY rootfs / ARG BASHIO_VERSION=0.13.0 @@ -11,9 +12,12 @@ RUN \ ################ apt-get update \ && apt-get install -y --no-install-recommends \ - jq \ - cifs-utils \ - keyutils \ + jq \ + cifs-utils \ + keyutils \ + samba \ + nginx \ + && apt-get clean \ ################## # Install bashio # diff --git a/cloudcommander/config.json b/cloudcommander/config.json index c0bde73bc..dfa364ad9 100644 --- a/cloudcommander/config.json +++ b/cloudcommander/config.json @@ -11,6 +11,9 @@ "armv7", "armhf" ], + "ingress": true, + "ingress_port": 8099, + "panel_icon": "mdi:file-search", "ports": { "8000/tcp": 8000 }, diff --git a/cloudcommander/rootfs/etc/nginx/includes/mime.types b/cloudcommander/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 000000000..7c7cdef2d --- /dev/null +++ b/cloudcommander/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/cloudcommander/rootfs/etc/nginx/includes/proxy_params.conf b/cloudcommander/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 000000000..924ba949e --- /dev/null +++ b/cloudcommander/rootfs/etc/nginx/includes/proxy_params.conf @@ -0,0 +1,16 @@ +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_hide_header X-Frame-Options; +proxy_set_header Accept-Encoding ""; +proxy_set_header Connection $connection_upgrade; +proxy_set_header Upgrade $http_upgrade; +proxy_set_header Host $http_host; +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/cloudcommander/rootfs/etc/nginx/includes/resolver.conf b/cloudcommander/rootfs/etc/nginx/includes/resolver.conf new file mode 100644 index 000000000..6485af141 --- /dev/null +++ b/cloudcommander/rootfs/etc/nginx/includes/resolver.conf @@ -0,0 +1 @@ +resolver 127.0.0.11; diff --git a/cloudcommander/rootfs/etc/nginx/includes/server_params.conf b/cloudcommander/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 000000000..09c06543e --- /dev/null +++ b/cloudcommander/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/cloudcommander/rootfs/etc/nginx/includes/ssl_params.conf b/cloudcommander/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 000000000..6f1500599 --- /dev/null +++ b/cloudcommander/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/cloudcommander/rootfs/etc/nginx/includes/upstream.conf b/cloudcommander/rootfs/etc/nginx/includes/upstream.conf new file mode 100644 index 000000000..16b54dd6f --- /dev/null +++ b/cloudcommander/rootfs/etc/nginx/includes/upstream.conf @@ -0,0 +1,3 @@ +upstream backend { + server 127.0.0.1:8000; +} diff --git a/cloudcommander/rootfs/etc/nginx/nginx.conf b/cloudcommander/rootfs/etc/nginx/nginx.conf new file mode 100644 index 000000000..3648d92a2 --- /dev/null +++ b/cloudcommander/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/cloudcommander/rootfs/etc/nginx/servers/ingress.conf b/cloudcommander/rootfs/etc/nginx/servers/ingress.conf new file mode 100644 index 000000000..5b031070e --- /dev/null +++ b/cloudcommander/rootfs/etc/nginx/servers/ingress.conf @@ -0,0 +1,17 @@ +server { + listen %%interface%%:%%port%% 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_connect_timeout 30m; + proxy_send_timeout 30m; + proxy_read_timeout 30m; + proxy_pass http://backend/%%baseurl%%/; + } + +} diff --git a/cloudcommander/run.sh b/cloudcommander/rootfs/run.sh similarity index 97% rename from cloudcommander/run.sh rename to cloudcommander/rootfs/run.sh index f2fc96e1c..873abd77b 100644 --- a/cloudcommander/run.sh +++ b/cloudcommander/rootfs/run.sh @@ -131,4 +131,8 @@ fi || true bashio::log.info "The server will start. Please wait 30 seconds before the web UI is available. Enjoy !" -./usr/src/app/bin/cloudcmd.mjs +./usr/src/app/bin/cloudcmd.mjs & \ +bashio::net.wait_for 8080 localhost 900 || true +bashio::log.info "Nginx started for Ingress" +exec nginx + diff --git a/filebrowser/rootfs/run.sh b/filebrowser/rootfs/run.sh index 4f08d1c7a..bc9e284f7 100644 --- a/filebrowser/rootfs/run.sh +++ b/filebrowser/rootfs/run.sh @@ -174,7 +174,4 @@ fi bashio::log.info "Please wait 1 or 2 minutes to allow the server to load" -/./filebrowser $CERTFILE $KEYFILE --root=/ --address=0.0.0.0 --database=/config/filebrowser/filebrowser.dB $NOAUTH & \ -bashio::net.wait_for 8080 localhost 900 || true -bashio::log.info "Nginx started for Ingress" -exec nginx +/./filebrowser $CERTFILE $KEYFILE --root=/ --address=0.0.0.0 --database=/config/filebrowser/filebrowser.dB $NOAUTH \ No newline at end of file