From 296740aeadadccc5a0b40b7d95d2ed4d010522d1 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Tue, 5 Nov 2024 13:33:55 +1100
Subject: [PATCH] Change build to remove unnessary files in the resulting
 container

---
 .gitea/workflows/build_docker.yaml      | 9 +++------
 docker/Dockerfile                       | 8 ++++----
 init-container => docker/init-container | 0
 3 files changed, 7 insertions(+), 10 deletions(-)
 rename init-container => docker/init-container (100%)

diff --git a/.gitea/workflows/build_docker.yaml b/.gitea/workflows/build_docker.yaml
index aaba027..60ab88e 100644
--- a/.gitea/workflows/build_docker.yaml
+++ b/.gitea/workflows/build_docker.yaml
@@ -74,8 +74,7 @@ jobs:
         ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
         ## Some debugging info
         # docker info && docker version
-        env|sort
-        echo "PRT: ${{ secrets.PKG_WRITE_TOKEN }}"
+        # env|sort
 
     - name: Registry FQDN Setup
       id: registry
@@ -93,12 +92,10 @@ jobs:
     - name: Code Checkout
       uses: actions/checkout@v4
 
-    - name: Record version
+    - name: Record version and Delete Unnecessary files
       run: |
-        pwd
-        ls -al
         echo ${GITHUB_SHA::8} > VERSION
-        cat VERSION
+        rm -rf .git* tests/ storage/app/test/
 
     - name: Build and Push Docker Image
       uses: docker/build-push-action@v5
diff --git a/docker/Dockerfile b/docker/Dockerfile
index addba3a..f706d8a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,11 +1,11 @@
 FROM gitea.dege.au/docker/php:8.3-fpm-pgsql-server
 
-VOLUME [ "/var/cache/composer", "/var/lib/zerotier-one" ]
+VOLUME [ "${COMPOSER_HOME}", "/var/lib/zerotier-one" ]
 
 # Add Zerotier
 RUN apk add zerotier-one -X http://dl-cdn.alpinelinux.org/alpine/v3.17/community --no-cache
 
-COPY init-container /sbin/
+COPY docker/init-container /sbin/
 COPY . /var/www/html/
 
 RUN mkdir -p ${COMPOSER_HOME} \
@@ -13,7 +13,7 @@ RUN mkdir -p ${COMPOSER_HOME} \
 	&& touch .composer.refresh \
 	&& mv .env.example .env \
 	&& apk add --no-cache git \
-	&& FORCE_PERMS=1 NGINX_START=FALSE /sbin/init \
+	&& APP_TIMEZONE=UTC FORCE_PERMS=1 NGINX_START=FALSE /sbin/init \
 	&& apk del --no-cache git \
 	&& chmod +x /var/www/html/artisan /var/www/html/init-php.sh \
-	&& rm -rf ${COMPOSER_HOME}/* .git* composer.lock
+	&& rm -rf ${COMPOSER_HOME}/* composer.lock storage/logs/*.log
diff --git a/init-container b/docker/init-container
similarity index 100%
rename from init-container
rename to docker/init-container