From 4f6e48e8a8904fef3f4a85b996bfb4248ae494cf Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sun, 2 Mar 2025 19:33:03 +1100
Subject: [PATCH] Updated Dockerfile and build, now using php 8.4

---
 docker/Dockerfile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c10d39f..9f6202e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,10 +1,12 @@
-FROM registry.dege.au/leenooks/php:8.3-fpm-pgsql
+FROM gitea.dege.au/docker/php:8.4-pgsql
 
 COPY . /var/www/html/
 
-RUN mkdir -p ${COMPOSER_HOME} && \
-	([ -r auth.json ] && mv auth.json ${COMPOSER_HOME}) || true && \
-	touch .composer.refresh && \
-	mv .env.example .env && \
-	FORCE_PERMS=1 NGINX_START=FALSE /sbin/init && \
-	rm -rf ${COMPOSER_HOME}/* .git* composer.lock
+USER root
+RUN mkdir -p ${COMPOSER_HOME} \
+        && ([ -r auth.json ] && mv auth.json ${COMPOSER_HOME}) || true \
+        && touch .composer.refresh \
+        && mv .env.example .env \
+        && FORCE_PERMS=1 BUILD=1 /sbin/init-docker \
+        && rm -rf ${COMPOSER_HOME}/* composer.lock
+USER ${SITE_USER}