Merge pull request #44 from WaterWolfDev/dev.waterwolf.club

Routine updates (Alpine 3.20, PHP and NPM)

Dockerfile

@@ -1,7 +1,7 @@
 #
 # Base build (common steps)
 #
-FROM php:8.3-fpm-alpine3.19 AS base
+FROM php:8.3-fpm-alpine3.20 AS base
 
 ENV TZ=UTC
 
@@ -42,24 +42,20 @@ VOLUME ["/var/app/media"]
 
 EXPOSE 8080
 
-WORKDIR /var/app/www
-
-COPY --chown=app:app . .
-
 #
 # Development Build
 #
 FROM base AS development
 
 COPY ./build/dev/services/ /etc/supervisor.d/
 COPY ./build/dev/Caddyfile /etc/Caddyfile
+
 COPY ./build/dev/entrypoint.sh /var/app/entrypoint.sh
+RUN chmod a+x /var/app/entrypoint.sh
 
 RUN apk add --no-cache shadow
 
-RUN chmod a+x /var/app/entrypoint.sh
-
-USER root
+WORKDIR /var/app/www
 
 ENV APPLICATION_ENV=development
 
@@ -74,10 +70,12 @@ FROM base AS testing
 COPY ./build/testing/entrypoint.sh /var/app/entrypoint.sh
 RUN chmod a+x /var/app/entrypoint.sh
 
-USER root
-
 ENV APPLICATION_ENV=testing
 
+WORKDIR /var/app/www
+
+COPY --chown=app:app . .
+
 ENTRYPOINT ["/var/app/entrypoint.sh"]
 CMD ["app_ci"]
 
@@ -93,6 +91,10 @@ RUN chmod a+x /var/app/entrypoint.sh
 
 USER app
 
+WORKDIR /var/app/www
+
+COPY --chown=app:app . .
+
 RUN composer install --no-dev --no-ansi --no-autoloader --no-interaction \
     && composer dump-autoload --optimize --classmap-authoritative \
     && composer clear-cache