From 0a7cbe6db69ab14b5130748e940aaa6e7c057f84 Mon Sep 17 00:00:00 2001 From: GilbN Date: Fri, 22 Jul 2022 13:29:51 +0200 Subject: [PATCH] Adds docker-mods to /config/docker-mods --- docker/root/etc/cont-init.d/50-config | 32 ++++++++++++++++++++++----- linux-amd64.Dockerfile | 1 + linux-arm-v7.Dockerfile | 1 + linux-arm64.Dockerfile | 1 + 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/docker/root/etc/cont-init.d/50-config b/docker/root/etc/cont-init.d/50-config index d871395e..856f3ee2 100644 --- a/docker/root/etc/cont-init.d/50-config +++ b/docker/root/etc/cont-init.d/50-config @@ -1,11 +1,23 @@ #!/usr/bin/with-contenv bash -echo '------------------' -echo '| theme.park |' -echo '------------------' +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 "Variables set:\\n\ +echo -e "[theme.park-init] Variables set:\\n\ PUID=${PUID}\\n\ PGID=${PGID}\\n\ TZ=${TZ}\\n\ @@ -29,8 +41,10 @@ cp /defaults/default /config/nginx/site-confs # make our folders and links mkdir -p \ - /config/www/{css,resources} + /config/www/{css,resources} \ + /config/docker-mods +echo '[theme.park-init] Copying theme files' # copy theme files cp -R /app/themepark/css /config/www cp -R /app/themepark/resources /config/www @@ -38,7 +52,13 @@ cp /app/themepark/index.html /config/www cp /app/themepark/themes.py /config/www cp /app/themepark/CNAME /config/www -echo 'Creating CSS files' +echo '[theme.park-init] Copying mods into /config/docker-mods' +# copy mods + for folder in /app/themepark/docker-mods/*; do \ + cp /app/themepark/docker-mods/"${folder##*/}"/root/etc/cont-init.d/98-themepark /config/docker-mods/98-themepark-"${folder##*/}"; \ + done + +echo '[theme.park-init] Running themes.py and creating CSS files' python3 /config/www/themes.py # permissions diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile index 1dae9389..b5df2588 100644 --- a/linux-amd64.Dockerfile +++ b/linux-amd64.Dockerfile @@ -18,6 +18,7 @@ apk add --no-cache --virtual=runtime-dependencies \ WORKDIR /app COPY css/ /app/themepark/css/ COPY resources/ /app/themepark/resources/ +COPY docker-mods/ /app/themepark/docker-mods/ COPY themes.py index.html CNAME /app/themepark/ COPY docker/root/ / \ No newline at end of file diff --git a/linux-arm-v7.Dockerfile b/linux-arm-v7.Dockerfile index 4044eb6f..8992e1a5 100644 --- a/linux-arm-v7.Dockerfile +++ b/linux-arm-v7.Dockerfile @@ -18,6 +18,7 @@ apk add --no-cache --virtual=runtime-dependencies \ WORKDIR /app COPY css/ /app/themepark/css/ COPY resources/ /app/themepark/resources/ +COPY docker-mods/ /app/themepark/docker-mods/ COPY themes.py index.html CNAME /app/themepark/ COPY docker/root/ / \ No newline at end of file diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile index 7945ef59..3d338d72 100644 --- a/linux-arm64.Dockerfile +++ b/linux-arm64.Dockerfile @@ -18,6 +18,7 @@ apk add --no-cache --virtual=runtime-dependencies \ WORKDIR /app COPY css/ /app/themepark/css/ COPY resources/ /app/themepark/resources/ +COPY docker-mods/ /app/themepark/docker-mods/ COPY themes.py index.html CNAME /app/themepark/ COPY docker/root/ / \ No newline at end of file