From 2eb0ee5579571555ba176112f60de60820f15ea2 Mon Sep 17 00:00:00 2001
From: GilbN <GilbN@users.noreply.github.com>
Date: Tue, 22 Mar 2022 20:23:15 +0000
Subject: [PATCH] deploy: ab8164255ba1017d746083c57a71d3232c1ddc60

---
 .github/workflows/docker-build.yml    | 8 ++++----
 Dockerfile                            | 2 +-
 docker/root/etc/cont-init.d/50-config | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index df886386..1044842e 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -29,12 +29,12 @@ jobs:
       - name: build&push master
         if: ${{ github.event.release.target_commitish == 'live' }}
         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 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 ghcr.io/gilbn/theme.park
       - name: build&push develop
         if: ${{ github.ref == 'refs/heads/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 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
@@ -57,11 +57,11 @@ jobs:
       - name: build&push dh master
         if: ${{ github.event.release.target_commitish == 'live' }}
         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 gilbn/theme.park:${{ steps.get_version.outputs.VERSION }}
+            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 gilbn/theme.park:${{ steps.get_version.outputs.VERSION }} .
             docker push gilbn/theme.park
       - name: build&push dh develop
         if: ${{ github.ref == 'refs/heads/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 --tag }}
+            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
 
diff --git a/Dockerfile b/Dockerfile
index c68117e8..56604234 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,6 @@ apk add --no-cache --virtual=build-dependencies \
 WORKDIR /app
 COPY css/ /app/themepark/css/
 COPY resources/ /app/themepark/resources/
-COPY themes.py index.html /app/themepark/
+COPY themes.py index.html CNAME /app/themepark/
 
 COPY docker/root/ /
\ No newline at end of file
diff --git a/docker/root/etc/cont-init.d/50-config b/docker/root/etc/cont-init.d/50-config
index fdd5f88a..9d570ba0 100644
--- a/docker/root/etc/cont-init.d/50-config
+++ b/docker/root/etc/cont-init.d/50-config
@@ -31,6 +31,7 @@ cp -R /app/themepark/css /config/www
 cp -R /app/themepark/resources /config/www
 cp /app/themepark/index.html /config/www
 cp /app/themepark/themes.py /config/www
+cp /app/themepark/CNAME /config/www
 
 # permissions
 chown -R abc:abc \