Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion css/base/radarr/radarr-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@
}

[class*="MovieFileEditorTable-container-"],
[class*="MovieHistoryTable-container-"] {
[class*="MovieHistoryTable-container-"],
[class*="MovieTitlesTable-container-"] {
border: 1px solid transparent;
background: var(--transparency-dark-25);
}
Expand Down
66 changes: 32 additions & 34 deletions docker/root/defaults/default → docker/root/defaults/default.conf
Original file line number Diff line number Diff line change
@@ -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;
}
10 changes: 10 additions & 0 deletions docker/root/etc/s6-overlay/s6-rc.d/init-adduser/branding
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

████████╗██╗ ██╗███████╗███╗ ███╗███████╗ ██████╗ █████╗ ██████╗ ██╗ ██╗
╚══██╔══╝██║ ██║██╔════╝████╗ ████║██╔════╝ ██╔══██╗██╔══██╗██╔══██╗██║ ██╔╝
██║ ███████║█████╗ ██╔████╔██║█████╗ ██████╔╝███████║██████╔╝█████╔╝
██║ ██╔══██║██╔══╝ ██║╚██╔╝██║██╔══╝ ██╔═══╝ ██╔══██║██╔══██╗██╔═██╗
██║ ██║ ██║███████╗██║ ╚═╝ ██║███████╗██╗██║ ██║ ██║██║ ██║██║ ██╗
╚═╝ ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝╚══════╝╚═╝╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝

Made by @gilbN
https://theme-park.dev
1 change: 1 addition & 0 deletions docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions docker/root/etc/s6-overlay/s6-rc.d/init-themepark-end/up
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# This file doesn't do anything, it's just the end of the themepark init process
22 changes: 3 additions & 19 deletions docker/root/etc/cont-init.d/50-config → ...etc/s6-overlay/s6-rc.d/init-themepark/run
100644 → 100755
Original file line number Diff line number Diff line change
@@ -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\
Expand All @@ -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 \
Expand All @@ -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
1 change: 1 addition & 0 deletions docker/root/etc/s6-overlay/s6-rc.d/init-themepark/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions docker/root/etc/s6-overlay/s6-rc.d/init-themepark/up
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-themepark/run
Empty file.
2 changes: 1 addition & 1 deletion linux-amd64.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion linux-arm-v7.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion linux-arm64.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down