From 4819bf6afe8b49a00ae225743cae20153eb65779 Mon Sep 17 00:00:00 2001 From: Marius <24592972+gilbN@users.noreply.github.com> Date: Sat, 4 Mar 2023 16:02:32 +0100 Subject: [PATCH] =?UTF-8?q?Bump=20=F0=9F=90=8B=20base=20versions=20and=20a?= =?UTF-8?q?dd=20branding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../root/defaults/{default => default.conf} | 66 +++++++++---------- .../s6-overlay/s6-rc.d/init-adduser/branding | 10 +++ .../s6-rc.d/init-themepark-end/type | 1 + .../s6-overlay/s6-rc.d/init-themepark-end/up | 1 + .../dependencies.d/init-version-checks | 0 .../s6-rc.d/init-themepark/run} | 22 +------ .../s6-overlay/s6-rc.d/init-themepark/type | 1 + .../etc/s6-overlay/s6-rc.d/init-themepark/up | 1 + .../s6-rc.d/user/contents.d/init-themepark | 0 linux-amd64.Dockerfile | 2 +- linux-arm-v7.Dockerfile | 2 +- linux-arm64.Dockerfile | 2 +- 12 files changed, 52 insertions(+), 56 deletions(-) rename docker/root/defaults/{default => default.conf} (87%) create mode 100644 docker/root/etc/s6-overlay/s6-rc.d/init-adduser/branding create mode 100644 docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/type create mode 100644 docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/up create mode 100644 docker/root/etc/s6-overlay/s6-rc.d/init-themepark/dependencies.d/init-version-checks rename docker/root/etc/{cont-init.d/50-config => s6-overlay/s6-rc.d/init-themepark/run} (50%) create mode 100644 docker/root/etc/s6-overlay/s6-rc.d/init-themepark/type create mode 100644 docker/root/etc/s6-overlay/s6-rc.d/init-themepark/up create mode 100644 docker/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-themepark diff --git a/docker/root/defaults/default b/docker/root/defaults/default.conf similarity index 87% rename from docker/root/defaults/default rename to docker/root/defaults/default.conf index 9be9ed87..e839d8aa 100644 --- a/docker/root/defaults/default +++ b/docker/root/defaults/default.conf @@ -1,34 +1,32 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - listen 443 ssl http2; - listen [::]:443 ssl http2; - - server_name _; - - ssl_certificate /config/keys/cert.crt; - ssl_certificate_key /config/keys/cert.key; - - index index.html index.htm index.php; - - location / { - alias /config/www/; - try_files $uri $uri/ =404; - } - location /themepark {return 302 $scheme://$http_host/themepark/;} - location /themepark/ { - alias /config/www/; - sub_filter_types *; - sub_filter 'url("/css/' 'url("/themepark/css/'; - sub_filter 'url(/resources/' 'url(/themepark/resources/'; - sub_filter_once off; - try_files $uri $uri/ =404; - } - - # Don't cache - add_header Last-Modified $date_gmt; - add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0'; - if_modified_since off; - expires -1; - etag off; -} +server { + listen 80 default_server; + listen [::]:80 default_server; + + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name _; + + index index.html index.htm index.php; + + location / { + alias /config/www/; + try_files $uri $uri/ =404; + } + location /themepark {return 302 $scheme://$http_host/themepark/;} + location /themepark/ { + alias /config/www/; + sub_filter_types *; + sub_filter 'url("/css/' 'url("/themepark/css/'; + sub_filter 'url(/resources/' 'url(/themepark/resources/'; + sub_filter_once off; + try_files $uri $uri/ =404; + } + + # Don't cache + add_header Last-Modified $date_gmt; + add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0'; + if_modified_since off; + expires -1; + etag off; +} diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-adduser/branding b/docker/root/etc/s6-overlay/s6-rc.d/init-adduser/branding new file mode 100644 index 00000000..9b563c6f --- /dev/null +++ b/docker/root/etc/s6-overlay/s6-rc.d/init-adduser/branding @@ -0,0 +1,10 @@ + +████████╗██╗ ██╗███████╗███╗ ███╗███████╗ ██████╗ █████╗ ██████╗ ██╗ ██╗ +╚══██╔══╝██║ ██║██╔════╝████╗ ████║██╔════╝ ██╔══██╗██╔══██╗██╔══██╗██║ ██╔╝ + ██║ ███████║█████╗ ██╔████╔██║█████╗ ██████╔╝███████║██████╔╝█████╔╝ + ██║ ██╔══██║██╔══╝ ██║╚██╔╝██║██╔══╝ ██╔═══╝ ██╔══██║██╔══██╗██╔═██╗ + ██║ ██║ ██║███████╗██║ ╚═╝ ██║███████╗██╗██║ ██║ ██║██║ ██║██║ ██╗ + ╚═╝ ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝╚══════╝╚═╝╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝ + + Made by @gilbN + https://theme-park.dev diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/type b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/type new file mode 100644 index 00000000..3d92b15f --- /dev/null +++ b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/up b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/up new file mode 100644 index 00000000..9af9ece1 --- /dev/null +++ b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/up @@ -0,0 +1 @@ +# This file doesn't do anything, it's just the end of the themepark init process diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/dependencies.d/init-version-checks b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/dependencies.d/init-version-checks new file mode 100644 index 00000000..e69de29b diff --git a/docker/root/etc/cont-init.d/50-config b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/run similarity index 50% rename from docker/root/etc/cont-init.d/50-config rename to docker/root/etc/s6-overlay/s6-rc.d/init-themepark/run index 856f3ee2..71aa37c1 100644 --- a/docker/root/etc/cont-init.d/50-config +++ b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/run @@ -1,21 +1,5 @@ #!/usr/bin/with-contenv bash -echo ' ----------------------------------------------------------------------------------------- - dP dP dP - 88 88 88 - d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b. 88d888b. .d8888b. 88d888b. 88 .dP - 88 88 `88 88ooood8 88 88 88 88ooood8 88. `88 88 `88 88 `88 88888. - 88 88 88 88. ... 88 88 88 88. ... 88. .88 88 88 88 88 `8b. - dP dP dP `88888P dP dP dP `88888P 88 88Y888P `88888P8 dP dP `YP - 88 - dP - - Made by @gilbN - https://theme-park.dev -----------------------------------------------------------------------------------------' - - # Display variables for troubleshooting echo -e "[theme.park-init] Variables set:\\n\ PUID=${PUID}\\n\ @@ -31,13 +15,13 @@ case ${TP_URLBASE} in ;; esac -DEFAULT='/defaults/default' +DEFAULT='/defaults/default.conf' if [[ ${TP_URLBASE} ]]; then if ! grep -q "${TP_URLBASE}" "${DEFAULT}"; then sed -i "s/themepark/${TP_URLBASE}/g" ${DEFAULT} fi fi -cp /defaults/default /config/nginx/site-confs +cp /defaults/default.conf /config/nginx/site-confs # make our folders and links mkdir -p \ @@ -60,7 +44,7 @@ echo '[theme.park-init] Copying mods into /config/docker-mods' echo '[theme.park-init] Running themes.py and creating CSS files' python3 /config/www/themes.py - +echo '[theme.park-init] done.' # permissions chown -R abc:abc \ /config \ No newline at end of file diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/type b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/type new file mode 100644 index 00000000..3d92b15f --- /dev/null +++ b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/up b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/up new file mode 100644 index 00000000..081a3ebe --- /dev/null +++ b/docker/root/etc/s6-overlay/s6-rc.d/init-themepark/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-themepark/run diff --git a/docker/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-themepark b/docker/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-themepark new file mode 100644 index 00000000..e69de29b diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile index b5df2588..e56c810d 100644 --- a/linux-amd64.Dockerfile +++ b/linux-amd64.Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.16 # set version label ARG BUILD_DATE diff --git a/linux-arm-v7.Dockerfile b/linux-arm-v7.Dockerfile index 8992e1a5..aac929d3 100644 --- a/linux-arm-v7.Dockerfile +++ b/linux-arm-v7.Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.16 # set version label ARG BUILD_DATE diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile index 3d338d72..e1143873 100644 --- a/linux-arm64.Dockerfile +++ b/linux-arm64.Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.16 # set version label ARG BUILD_DATE