deploy: 6a7b1feade

.github/workflows/docker-build.yml

@@ -12,15 +12,17 @@ on:
         options:
         - master
         - develop
+        - testing
       tag:
         description: 'Add a tag'
   push:
     branches:
       - develop
+      - testing
     paths-ignore:
         - '.github/**'
 jobs:
-  push_to_ghcr_io:
+  build-and-push-it-to-the-limit:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
@@ -30,61 +32,81 @@ jobs:
       - name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::${{ github.event.release.tag_name }}
+
       - name: Set current date as env variable
         id: date_time
         run: echo ::set-output name=NOW::$(date +'%Y-%m-%dT%H:%M:%S')
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Docker meta
+        id: metadata
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            ghcr.io/gilbn/theme.park
+            gilbn/theme.park
+          tags: |
+            type=ref,event=branch
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GH_PAT }}
-      - name: build&push master
+
-        if: ${{ github.event.release.target_commitish == 'master' }}
-        run: |
-            docker build --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park --tag ghcr.io/gilbn/theme.park:${{ steps.get_version.outputs.VERSION }} .
-            docker push --all-tags ghcr.io/gilbn/theme.park
-      - name: manual build&push master
-        if: ${{ github.event.inputs.branch == 'master' }}
-        run: |
-            docker build --build-arg TP_RELEASE=${{ github.event.inputs.tag }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park --tag ghcr.io/gilbn/theme.park:${{ github.event.inputs.tag }} .
-            docker push --all-tags ghcr.io/gilbn/theme.park
-      - name: build&push develop
-        if: ${{ github.ref == 'refs/heads/develop' || github.event.inputs.branch == 'develop' }}
-        run: |
-            docker build --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park:develop .
-            docker push --all-tags ghcr.io/gilbn/theme.park
-  push_to_dockerhub:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Get the version
-        id: get_version
-        run: echo ::set-output name=VERSION::${{ github.event.release.tag_name }}
-      - name: Set current date as env variable
-        id: date_time
-        run: echo ::set-output name=NOW::$(date +'%Y-%m-%dT%H:%M:%S')
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DH_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: build&push dh master
-        if: ${{ github.event.release.target_commitish == 'master' }}
-        run: |
-            docker build --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag gilbn/theme.park --tag gilbn/theme.park:${{ steps.get_version.outputs.VERSION }} .
-            docker push --all-tags gilbn/theme.park
-      - name: manual build&push dh master
-        if: ${{ github.event.inputs.branch == 'master' }}
-        run: |
-            docker build --build-arg TP_RELEASE=${{ github.event.inputs.tag }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag gilbn/theme.park --tag gilbn/theme.park:${{ github.event.inputs.tag }} .
-            docker push --all-tags gilbn/theme.park
-      - name: build&push dh develop
-        if: ${{ github.ref == 'refs/heads/develop' || github.event.inputs.branch == 'develop' }}
-        run: |
-            docker build --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag gilbn/theme.park:develop .
-            docker push --all-tags gilbn/theme.park
 
+      - name: build&push master
+        if: ${{ github.event.release.target_commitish == 'master' }}
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: latest
+          labels: ${{ steps.metadata.outputs.labels }}
+          build-args: TP_RELEASE=${{ steps.get_version.outputs.VERSION }},BUILD_DATE=${{ steps.date_time.outputs.NOW }}
+
+      - name: manual build&push master
+        if: ${{ github.event.inputs.branch == 'master' }}
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: latest, ${{ github.event.inputs.tag }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          build-args: TP_RELEASE=${{ steps.get_version.outputs.VERSION }},BUILD_DATE=${{ steps.date_time.outputs.NOW }}
+
+      - name: build&push develop
+        if: ${{ github.ref == 'refs/heads/develop' || github.event.inputs.branch == 'develop' }}
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          build-args: TP_RELEASE=${{ steps.get_version.outputs.VERSION }},BUILD_DATE=${{ steps.date_time.outputs.NOW }}
+
+      - name: build&push testing
+        if: ${{ github.ref == 'refs/heads/testing' || github.event.inputs.branch == 'testing' }}
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          build-args: TP_RELEASE=${{ steps.get_version.outputs.VERSION }},BUILD_DATE=${{ steps.date_time.outputs.NOW }}

Dockerfile

@@ -1,16 +1,16 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
+FROM --platform=${BUILDPLATFORM} ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
 
 # set version label
 ARG BUILD_DATE
 ARG TP_RELEASE
-LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE} Platform: ${BUILDPLATFORM}"
 LABEL maintainer="gilbn"
+LABEL org.opencontainers.image.description DESCRIPTION
 
 RUN \
 echo " ## Installing packages ## " && \
 apk add --no-cache --virtual=build-dependencies \
-    python3 \
+    python3 && \
-    curl && \
   echo "**** install theme.park ****" && \
     mkdir -p /app/themepark
 

css/base/tautulli/aquamarine.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/theme-options/aquamarine.css?sha=e263f729d3f58f939c76a02c8ed89cb17b02fd5c");

css/base/tautulli/blackberry-abyss.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/blackberry-abyss.css?sha=b64eb1f01cbd66a9dd888a96e62bb05ccf749802");

css/base/tautulli/blackberry-amethyst.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/blackberry-amethyst.css?sha=1f1cd7d10acca7c00b54073724bb75e73c83a603");

css/base/tautulli/blackberry-carol.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/blackberry-carol.css?sha=0c7da8c7ad5257ee575adfed2e8ff3987fe3dfa1");

css/base/tautulli/blackberry-dreamscape.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/blackberry-dreamscape.css?sha=adc24f5a940aa6f8e0061e4b1ad86126f95ba57f");

css/base/tautulli/blackberry-flamingo.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/blackberry-flamingo.css?sha=d075526c4af1caa77d1d6ccb11536b66aa993b99");

css/base/tautulli/blackberry-hearth.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/blackberry-hearth.css?sha=5a139953a525ca38111fd2dfa815c686bc5dbb88");

css/base/tautulli/blackberry-martian.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/blackberry-martian.css?sha=6eb4cd0529632fca270378f66f777182f4e2fb3e");

css/base/tautulli/blackberry-pumpkin.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/blackberry-pumpkin.css?sha=0e4c45af378262c4705bc538fdc3357e24613098");

css/base/tautulli/blackberry-royal.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/blackberry-royal.css?sha=6aebe0c7f1aa26cb9822b1e44ebd7ffa628d981a");

css/base/tautulli/blackberry-shadow.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/blackberry-shadow.css?sha=b1ea4de97e26ef32b52edc79e0fb8aeee4a7d83d");

css/base/tautulli/blackberry-solar.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/blackberry-solar.css?sha=d53082caa15548ea53a518a9ca950eeab6a95059");

css/base/tautulli/blackberry-vanta.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/blackberry-vanta.css?sha=5ae2f81e3d70a7a3f166ebfba6ae4ff050ea766d");

css/base/tautulli/dark.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/theme-options/dark.css?sha=08b228ea163be7beccc6bd88a6d002c4e172032e");

css/base/tautulli/dracula.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/theme-options/dracula.css?sha=60d9ec4d3e22fe15d205242f41ce71d25c4cf056");

css/base/tautulli/hotline-old.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/hotline-old.css?sha=4befb6edb8a0b329baa4319e3c6fec9856f1d76f");

css/base/tautulli/hotline.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/theme-options/hotline.css?sha=5cba20990e5a70eef88445d3df6c7bc72bc22ac9");

css/base/tautulli/hotpink.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/theme-options/hotpink.css?sha=18ffb7ff0cf9d4ae97f09c2ccb980d8bb0fd9d3e");

css/base/tautulli/mind.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/mind.css?sha=6689c5111ff6eec40cce87e2ce7c659946fe00a1");

css/base/tautulli/nord.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/theme-options/nord.css?sha=dc62b646ac8f48d4e1e8722f305f8a174e1a4447");

css/base/tautulli/onedark.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/onedark.css?sha=7754291defa741c805bb0aec4d647ba27fec9cca");

css/base/tautulli/organizr.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/theme-options/organizr.css?sha=2a1ee65a26780204509f713f7ea2d5ebdc5bd057");

css/base/tautulli/overseerr.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/theme-options/overseerr.css?sha=eedb2e0df6cc892903b8716a05184c61577ebe20");

css/base/tautulli/pine-shadow.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/pine-shadow.css?sha=cc2adf274933630ff06539a244ba9fffff9090dc");

css/base/tautulli/plex.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/theme-options/plex.css?sha=bce3fc8daf82f424f1c86672ede9aa07ad0cfdae");

css/base/tautulli/power.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/power.css?sha=3dc209c5ab792d0fb00407f361dc5b75040054e2");

css/base/tautulli/reality.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/reality.css?sha=cefddc8d27191a2e6fec826e80b2c83d107037c3");

css/base/tautulli/soul.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/soul.css?sha=863105e7b6a608c6211d335be61cf6f0b3a5b629");

css/base/tautulli/space-gray.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/theme-options/space-gray.css?sha=8c996eb8d2c729fe95861ed683e2a8993a413c93");

css/base/tautulli/space.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/space.css?sha=5fadc3d68221e85c2ebb4b0d5649b985a7681d23");

css/base/tautulli/time.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/time.css?sha=ee60b4f5f6e787181abe2ce5f56abc8dcceabd98");

css/base/tautulli/trueblack.css

@@ -1,2 +1,2 @@
-@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f");
+@import url("https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04");
 @import url("https://theme-park.dev/css/community-theme-options/trueblack.css?sha=de3a1b7f21d63c3c9d72c16e03f90c7309ceb695");

docker/root/defaults/default

@@ -9,17 +9,23 @@ server {
     ssl_certificate /config/keys/cert.crt;
     ssl_certificate_key /config/keys/cert.key;
 
-    root /config/www;
     index index.html index.htm index.php;
 
+    #location#/ {return 302 $scheme://TP_DOMAIN/TP_URLBASE$request_uri;}
+
     location / {
+        alias /config/www/;
         sub_filter_types *;
-        sub_filter 'https://theme-park.dev' $scheme://TP_DOMAIN;
+        sub_filter 'https://theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/;
-        sub_filter 'http://theme-park.dev' $scheme://TP_DOMAIN;
+        sub_filter 'http://theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/;
-        sub_filter 'https://develop.theme-park.dev' $scheme://TP_DOMAIN;
+        sub_filter 'https://develop.theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/;
-        sub_filter 'http://develop.theme-park.dev' $scheme://TP_DOMAIN;
+        sub_filter 'http://develop.theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/;
         sub_filter_once off;
         try_files $uri $uri/ /index.html;
+
+        #SUBFOLDER SUBFILTERS
+        #sub_filter 'https://TP_DOMAIN' $scheme://TP_DOMAIN/TP_URLBASE;
+        #sub_filter 'http://TP_DOMAIN' $scheme://TP_DOMAIN/TP_URLBASE;
     }
 
     # Don't cache

docker/root/etc/cont-init.d/50-config

@@ -10,6 +10,7 @@ PUID=${PUID}\\n\
 PGID=${PGID}\\n\
 TZ=${TZ}\\n\
 TP_SCHEME=${TP_SCHEME}\\n\
+TP_URLBASE=${TP_URLBASE}\\n\
 TP_DOMAIN=${TP_DOMAIN}\\n"
 
 if [[ -z ${TP_DOMAIN} ]]; then
@@ -18,12 +19,35 @@ if [[ -z ${TP_DOMAIN} ]]; then
 fi
 
 if [[ -z ${TP_SCHEME} ]]; then
-    echo 'No scheme set, defaulting to https'
+    echo 'No scheme set, defaulting to $scheme'
-    TP_SCHEME='https'
+    TP_SCHEME='$scheme'
 fi
 
+if [[ -z ${TP_URLBASE} ]]; then
+    TP_URLBASE=''
+fi
+
+# Remove forward slash
+case ${TP_URLBASE} in
+  *"/"*)
+  TP_URLBASE=$(echo "${TP_URLBASE}" | sed 's/\///g')
+    ;;
+esac
+
 DEFAULT='/defaults/default'
-sed -i "s/TP_DOMAIN/${TP_DOMAIN} /g" ${DEFAULT}
+if [[ ${TP_URLBASE} ]]; then
+    if ! grep -q "location /${TP_URLBASE} {" "${DEFAULT}"; then
+        sed -i "s/location \//location \/${TP_URLBASE}/g" ${DEFAULT}
+        sed -i "s/TP_DOMAIN/${TP_DOMAIN}/g" ${DEFAULT}
+        sed -i "s/TP_URLBASE/${TP_URLBASE}/g" ${DEFAULT}
+        sed -i "s/#sub_filter/sub_filter/g" ${DEFAULT}
+        sed -i "s/#location#/location /g" ${DEFAULT}
+        sed -i "s/\$scheme/${TP_SCHEME}/g" ${DEFAULT}
+    fi
+elif [[ -z ${TP_URLBASE} ]]; then
+    sed -i "s/TP_DOMAIN\/TP_URLBASE/${TP_DOMAIN}/g" ${DEFAULT}
+    sed -i "s/\$scheme/${TP_SCHEME}/g" ${DEFAULT}
+fi
 cp /defaults/default /config/nginx/site-confs
 
 # make our folders and links

resources/landing-page/css/custom.css

@@ -73,7 +73,15 @@ section {
         background-color: rgba(0, 0, 0, 0.9);
     }
 }
+#mainNav .navbar-nav .nav-item .nav-link {
+    color: var(--label-text-color);
+  }
 
+#mainNav .navbar-nav .nav-item .nav-link:hover,
+#mainNav .navbar-nav .nav-item .nav-link:active {
+    color: var(--label-text-color);
+    opacity: .8;
+}
 @media (min-width: 992px) {
     #mainNav {
         box-shadow: none;
@@ -127,10 +135,6 @@ section {
     }
 }
 
-#mainNav .navbar-nav .nav-item .nav-link:hover,
-#mainNav .navbar-nav .nav-item .nav-link:active {
-    color: var(--text-hover);
-}
 
 #mainNav .navbar-nav .nav-item .nav-link.active {
     color: var(--link-color-hover) !important;

resources/landing-page/css/styles.css

@@ -11006,7 +11006,7 @@ hr.light {
 }
 
 #mainNav .navbar-nav .nav-item .nav-link {
-  color: #6c757d;
+  color: var(--label-text-color);
   font-family: "Merriweather Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   font-weight: 700;
   font-size: 0.9rem;

resources/landing-page/js/scripts.js

@@ -56,7 +56,7 @@ function injectTheme(theme,container="head") {
     } else html_element = document.body;
     let themeOption = document.getElementById("theme-option")
     let link = themeOption ? themeOption : document.createElement("link");
-    url = "/css/theme-options"
+    url = `${window.location.pathname}css/theme-options`
     link.type = "text/css";
     link.rel = "stylesheet";
     link.href = `${url}/${themeLower}.css`;
@@ -69,7 +69,7 @@ function injectTheme(theme,container="head") {
   var themeOptions;
 
   function addThemeData() {
-  let themeJsonUrl = "/themes.json"
+  let themeJsonUrl = "themes.json"
   fetch(themeJsonUrl)
   .then(response =>  response.json())
   .then(json => {
@@ -145,7 +145,7 @@ function fadeOutIn(speed) {
 }
 
 function updateMetaThemeColor() {
-    fetch(`/css/theme-options/${Object.keys(themeOptions)[currentIndex].toLowerCase()}.css`)
+    fetch(`${window.location.pathname}css/theme-options/${Object.keys(themeOptions)[currentIndex].toLowerCase()}.css`)
     .then(response =>  response.text())
     .then(text => {
         let re = text.match("--accent-color:.*;")[0]

themes.json

@@ -10,8 +10,8 @@
     "organizr": {
       "glass": {
         "css": [
-          "https://theme-park.dev/css/addons/organizr/glass/glass-login.css?sha=0200383709509139874da6540d8a7fc07030f172",
           "https://theme-park.dev/css/addons/organizr/glass/glass-base.css?sha=eeb9ae8a2a49eb30169cc3bbf2fc10941934742b",
+          "https://theme-park.dev/css/addons/organizr/glass/glass-login.css?sha=0200383709509139874da6540d8a7fc07030f172",
           "https://theme-park.dev/css/addons/organizr/glass/organizr-base-old.css?sha=e48f350f07564f9a83e886d10bfbd6038aec99d0"
         ]
       }
@@ -40,37 +40,37 @@
         "alien": {
           "css": [
             "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway4.css?sha=115d28a7d527e098e44699f7d22b23e707205ed5",
-            "https://theme-park.dev/css/addons/unraid/login-page/alien/scanner.css?sha=f4d3dec863555a5be0d3205ca0810ad974671d6d",
             "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway3.css?sha=0401db465b9ab0aa938abb24e8d5687bb848f618",
-            "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway.css?sha=d9aec7ca0b8b788bbaf5178e6807fdd7c70a2441",
+            "https://theme-park.dev/css/addons/unraid/login-page/alien/isolation.css?sha=d997771e2ba2b702f62aef1f2ecb0ae62bb262ec",
+            "https://theme-park.dev/css/addons/unraid/login-page/alien/nightmare.css?sha=b634670595e328953f65f25d9b89fb8b3ed84335",
+            "https://theme-park.dev/css/addons/unraid/login-page/alien/scanner.css?sha=f4d3dec863555a5be0d3205ca0810ad974671d6d",
             "https://theme-park.dev/css/addons/unraid/login-page/alien/alien_base.css?sha=7e310e223692a1169d19ad0eec747488ece7ca4e",
             "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway2.css?sha=e55647c34fd947005f060b23c1f2753d9d166451",
             "https://theme-park.dev/css/addons/unraid/login-page/alien/isolation_video.css?sha=fec983cef8676c7e615dc6fcf3891454e479b039",
-            "https://theme-park.dev/css/addons/unraid/login-page/alien/isolation.css?sha=d997771e2ba2b702f62aef1f2ecb0ae62bb262ec",
+            "https://theme-park.dev/css/addons/unraid/login-page/alien/custom.css?sha=112bc6d8269f609d2f85ff1c7ec779b06f349fcd",
-            "https://theme-park.dev/css/addons/unraid/login-page/alien/nightmare.css?sha=b634670595e328953f65f25d9b89fb8b3ed84335",
+            "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway.css?sha=d9aec7ca0b8b788bbaf5178e6807fdd7c70a2441"
-            "https://theme-park.dev/css/addons/unraid/login-page/alien/custom.css?sha=112bc6d8269f609d2f85ff1c7ec779b06f349fcd"
           ]
         },
         "fallout": {
           "css": [
             "https://theme-park.dev/css/addons/unraid/login-page/fallout/fallout_video.css?sha=5e4feb3b106bd3ac10845441cc422b8bc52d5d14",
-            "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal2.css?sha=9034ac779a67e1d3fc3b8c6b9b290c56674efc63",
-            "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal.css?sha=8235bc4e8557977ba24cbe020778dfcbf61598fb",
-            "https://theme-park.dev/css/addons/unraid/login-page/fallout/terminal2.css?sha=d46175f466c10aeed585f1897e169e0f440caec8",
-            "https://theme-park.dev/css/addons/unraid/login-page/fallout/fallout_base.css?sha=3a79171bff7252461e4ff5e76b507640bffcf5e1",
             "https://theme-park.dev/css/addons/unraid/login-page/fallout/terminal.css?sha=795735e229857c54727dcb698706a0acc14ffe93",
-            "https://theme-park.dev/css/addons/unraid/login-page/fallout/custom.css?sha=112bc6d8269f609d2f85ff1c7ec779b06f349fcd"
+            "https://theme-park.dev/css/addons/unraid/login-page/fallout/terminal2.css?sha=d46175f466c10aeed585f1897e169e0f440caec8",
+            "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal.css?sha=8235bc4e8557977ba24cbe020778dfcbf61598fb",
+            "https://theme-park.dev/css/addons/unraid/login-page/fallout/custom.css?sha=112bc6d8269f609d2f85ff1c7ec779b06f349fcd",
+            "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal2.css?sha=9034ac779a67e1d3fc3b8c6b9b290c56674efc63",
+            "https://theme-park.dev/css/addons/unraid/login-page/fallout/fallout_base.css?sha=3a79171bff7252461e4ff5e76b507640bffcf5e1"
           ]
         },
         "retro-terminal": {
           "css": [
             "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/blue.css?sha=b60f87c35c8bb3953a326e5e5535b4e5ce88709e",
-            "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/red.css?sha=8b77411d76907a64f6d8f6f368998d93e222b100",
-            "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/amber.css?sha=14c5060439078fc9632f96017d9716e8f84692af",
             "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/white.css?sha=617715f3e09683f3d22c418dba59b7556f486016",
+            "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/red.css?sha=8b77411d76907a64f6d8f6f368998d93e222b100",
             "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/green.css?sha=ccd27fb2c9787c4705bf7eb87d4e4e9693f6fe2e",
             "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/retro-terminal-base.css?sha=860f370f1b8e25b26ab9bc45a73632de58c799ce",
-            "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/custom.css?sha=112bc6d8269f609d2f85ff1c7ec779b06f349fcd"
+            "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/custom.css?sha=112bc6d8269f609d2f85ff1c7ec779b06f349fcd",
+            "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/amber.css?sha=14c5060439078fc9632f96017d9716e8f84692af"
           ]
         }
       }
@@ -288,8 +288,8 @@
       "addons": {
         "glass": {
           "css": [
-            "https://theme-park.dev/css/addons/organizr/glass/glass-login.css?sha=0200383709509139874da6540d8a7fc07030f172",
             "https://theme-park.dev/css/addons/organizr/glass/glass-base.css?sha=eeb9ae8a2a49eb30169cc3bbf2fc10941934742b",
+            "https://theme-park.dev/css/addons/organizr/glass/glass-login.css?sha=0200383709509139874da6540d8a7fc07030f172",
             "https://theme-park.dev/css/addons/organizr/glass/organizr-base-old.css?sha=e48f350f07564f9a83e886d10bfbd6038aec99d0"
           ]
         }
@@ -372,7 +372,7 @@
     },
     "tautulli": {
       "addons": {},
-      "base_css": "https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=ba1e8e8b8014f61163e59a68fb03574304c1112f"
+      "base_css": "https://theme-park.dev/css/base/tautulli/tautulli-base.css?sha=87bb33e9ee15955f456a65aa47d63a1d58acbb04"
     },
     "transmission": {
       "addons": {},
@@ -384,37 +384,37 @@
           "alien": {
             "css": [
               "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway4.css?sha=115d28a7d527e098e44699f7d22b23e707205ed5",
-              "https://theme-park.dev/css/addons/unraid/login-page/alien/scanner.css?sha=f4d3dec863555a5be0d3205ca0810ad974671d6d",
               "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway3.css?sha=0401db465b9ab0aa938abb24e8d5687bb848f618",
-              "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway.css?sha=d9aec7ca0b8b788bbaf5178e6807fdd7c70a2441",
+              "https://theme-park.dev/css/addons/unraid/login-page/alien/isolation.css?sha=d997771e2ba2b702f62aef1f2ecb0ae62bb262ec",
+              "https://theme-park.dev/css/addons/unraid/login-page/alien/nightmare.css?sha=b634670595e328953f65f25d9b89fb8b3ed84335",
+              "https://theme-park.dev/css/addons/unraid/login-page/alien/scanner.css?sha=f4d3dec863555a5be0d3205ca0810ad974671d6d",
               "https://theme-park.dev/css/addons/unraid/login-page/alien/alien_base.css?sha=7e310e223692a1169d19ad0eec747488ece7ca4e",
               "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway2.css?sha=e55647c34fd947005f060b23c1f2753d9d166451",
               "https://theme-park.dev/css/addons/unraid/login-page/alien/isolation_video.css?sha=fec983cef8676c7e615dc6fcf3891454e479b039",
-              "https://theme-park.dev/css/addons/unraid/login-page/alien/isolation.css?sha=d997771e2ba2b702f62aef1f2ecb0ae62bb262ec",
+              "https://theme-park.dev/css/addons/unraid/login-page/alien/custom.css?sha=112bc6d8269f609d2f85ff1c7ec779b06f349fcd",
-              "https://theme-park.dev/css/addons/unraid/login-page/alien/nightmare.css?sha=b634670595e328953f65f25d9b89fb8b3ed84335",
+              "https://theme-park.dev/css/addons/unraid/login-page/alien/hallway.css?sha=d9aec7ca0b8b788bbaf5178e6807fdd7c70a2441"
-              "https://theme-park.dev/css/addons/unraid/login-page/alien/custom.css?sha=112bc6d8269f609d2f85ff1c7ec779b06f349fcd"
             ]
           },
           "fallout": {
             "css": [
               "https://theme-park.dev/css/addons/unraid/login-page/fallout/fallout_video.css?sha=5e4feb3b106bd3ac10845441cc422b8bc52d5d14",
-              "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal2.css?sha=9034ac779a67e1d3fc3b8c6b9b290c56674efc63",
-              "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal.css?sha=8235bc4e8557977ba24cbe020778dfcbf61598fb",
-              "https://theme-park.dev/css/addons/unraid/login-page/fallout/terminal2.css?sha=d46175f466c10aeed585f1897e169e0f440caec8",
-              "https://theme-park.dev/css/addons/unraid/login-page/fallout/fallout_base.css?sha=3a79171bff7252461e4ff5e76b507640bffcf5e1",
               "https://theme-park.dev/css/addons/unraid/login-page/fallout/terminal.css?sha=795735e229857c54727dcb698706a0acc14ffe93",
-              "https://theme-park.dev/css/addons/unraid/login-page/fallout/custom.css?sha=112bc6d8269f609d2f85ff1c7ec779b06f349fcd"
+              "https://theme-park.dev/css/addons/unraid/login-page/fallout/terminal2.css?sha=d46175f466c10aeed585f1897e169e0f440caec8",
+              "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal.css?sha=8235bc4e8557977ba24cbe020778dfcbf61598fb",
+              "https://theme-park.dev/css/addons/unraid/login-page/fallout/custom.css?sha=112bc6d8269f609d2f85ff1c7ec779b06f349fcd",
+              "https://theme-park.dev/css/addons/unraid/login-page/fallout/dirty_terminal2.css?sha=9034ac779a67e1d3fc3b8c6b9b290c56674efc63",
+              "https://theme-park.dev/css/addons/unraid/login-page/fallout/fallout_base.css?sha=3a79171bff7252461e4ff5e76b507640bffcf5e1"
             ]
           },
           "retro-terminal": {
             "css": [
               "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/blue.css?sha=b60f87c35c8bb3953a326e5e5535b4e5ce88709e",
-              "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/red.css?sha=8b77411d76907a64f6d8f6f368998d93e222b100",
-              "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/amber.css?sha=14c5060439078fc9632f96017d9716e8f84692af",
               "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/white.css?sha=617715f3e09683f3d22c418dba59b7556f486016",
+              "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/red.css?sha=8b77411d76907a64f6d8f6f368998d93e222b100",
               "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/green.css?sha=ccd27fb2c9787c4705bf7eb87d4e4e9693f6fe2e",
               "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/retro-terminal-base.css?sha=860f370f1b8e25b26ab9bc45a73632de58c799ce",
-              "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/custom.css?sha=112bc6d8269f609d2f85ff1c7ec779b06f349fcd"
+              "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/custom.css?sha=112bc6d8269f609d2f85ff1c7ec779b06f349fcd",
+              "https://theme-park.dev/css/addons/unraid/login-page/retro-terminal/amber.css?sha=14c5060439078fc9632f96017d9716e8f84692af"
             ]
           }
         }

themes.py

@@ -119,20 +119,20 @@ def create_json(app_folders: list = None, themes: list = None, community_themes:
 def create_theme_options():
     def create_css(folder):
         with open(f"{folder}/{app}/{theme.lower()}.css", "w") as create_app:
-            content = f'@import url("{applications[app]["base_css"]}");\n@import url("{themes[theme]["url"]}");'
+            content = f'@import url("{applications[app]["base_css"]}");\n@import url("{all_themes[theme]["url"]}");'
             create_app.write(content)
     with open("themes.json") as themes:
         data = load(themes)
-        themes = data["all-themes"]
+        all_themes = data["all-themes"]
         applications = data["applications"]
     for app in applications:
-        for theme in themes:
+        for theme in all_themes:
             folders = ["./css/base"]
             for folder in folders:
                 create_css(folder)
 
 env_domain = env.get('TP_DOMAIN')
-scheme = env.get('TP_SCHEME','https')
+scheme = env.get('TP_SCHEME','https') if env.get('TP_SCHEME') != '$scheme' else 'https'
 
 if __name__ == "__main__":
     app_folders = [name for name in listdir('./css/base') if isdir(join('./css/base', name))]