From f3477e6e80feee546472d6e7ad7b9a466627fde0 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 18 Jan 2024 20:27:00 +1100 Subject: [PATCH 1/2] Updates for DockerFile --- alpine/5/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/5/Dockerfile b/alpine/5/Dockerfile index b4d12246..90496d79 100644 --- a/alpine/5/Dockerfile +++ b/alpine/5/Dockerfile @@ -3,7 +3,7 @@ ARG BAK_STORAGE_PATH=/var/www/app/docker-backup-storage/ ARG BAK_PUBLIC_PATH=/var/www/app/docker-backup-public/ # Get Invoice Ninja and install nodejs packages -FROM --platform=$BUILDPLATFORM node:20-alpine as build +FROM --platform=$BUILDPLATFORM node:lts-alpine as build # Download Invoice Ninja ARG INVOICENINJA_VERSION From 93214291c978f78426807fb0285bd3cbd1f9de39 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 21 Jan 2024 12:52:08 +1100 Subject: [PATCH 2/2] v5.8.13 --- alpine/5/Dockerfile | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/alpine/5/Dockerfile b/alpine/5/Dockerfile index 90496d79..574f18f6 100644 --- a/alpine/5/Dockerfile +++ b/alpine/5/Dockerfile @@ -29,20 +29,11 @@ RUN cp -r dist/tinymce_6.4.2/* /var/www/app/public/tinymce_6.4.2/ # Download and extract the latest react application # -WORKDIR /var/www/app/ - -# Install node packages -ARG BAK_STORAGE_PATH -ARG BAK_PUBLIC_PATH -RUN --mount=target=/var/www/app/node_modules,type=cache \ - npm install \ - && npm run production \ - && mv /var/www/app/storage $BAK_STORAGE_PATH \ - && mv /var/www/app/public $BAK_PUBLIC_PATH - # Prepare php image FROM php:${PHP_VERSION}-fpm-alpine as prod +COPY --from=build / / + LABEL maintainer="David Bomba " # Adding caching_sha2_password.so @@ -109,6 +100,16 @@ ENV IS_DOCKER true RUN /usr/local/bin/composer install --no-dev --no-scripts --no-interaction RUN /usr/local/bin/composer dump-autoload --optimize --no-dev --classmap-authoritative --no-scripts --no-interaction +WORKDIR /var/www/app/ + +# Install node packages +ARG BAK_STORAGE_PATH +ARG BAK_PUBLIC_PATH +RUN npm install +RUN npm run production +RUN mv /var/www/app/storage $BAK_STORAGE_PATH +RUN mv /var/www/app/public $BAK_PUBLIC_PATH + # Override the environment settings from projects .env file ENV APP_ENV production ENV LOG errorlog