Merge pull request #524 from turbo124/master

Updates for docker files to use PHP 8.2

alpine/5/Dockerfile

@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.1
+ARG PHP_VERSION=8.2
 ARG BAK_STORAGE_PATH=/var/www/app/docker-backup-storage/
 ARG BAK_PUBLIC_PATH=/var/www/app/docker-backup-public/
 
@@ -21,6 +21,9 @@ RUN curl -LGO $(curl https://api.github.com/repos/invoiceninja/ui/releases/lates
 RUN cp invoiceninja-react.zip /tmp/invoiceninja-react.zip
 RUN unzip /tmp/invoiceninja-react.zip 
 RUN cp -r dist/react/* /var/www/app/public/react/
+RUN mkdir -p /var/www/app/public/tinymce_6.4.2/tinymce/js/
+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/
@@ -35,7 +38,7 @@ RUN --mount=target=/var/www/app/node_modules,type=cache \
     && mv /var/www/app/public $BAK_PUBLIC_PATH  
 
 # Prepare php image
-FROM php:${PHP_VERSION}-fpm-alpine3.15 as prod
+FROM php:${PHP_VERSION}-fpm-alpine as prod
 
 LABEL maintainer="David Bomba <turbo124@gmail.com>"
 
@@ -100,7 +103,8 @@ WORKDIR /var/www/app
 
 # Do not remove this ENV
 ENV IS_DOCKER true
-RUN /usr/local/bin/composer install --no-dev --no-scripts --no-interaction --no-autoloader 
+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 
 
 # Override the environment settings from projects .env file
 ENV APP_ENV production

alpine/5/rootfs/usr/local/bin/invoiceninja-init.sh

@@ -25,9 +25,9 @@ docker_process_init_files() {
     done
 }
 
-composer dump-autoload
 php artisan config:cache
 php artisan optimize
+php artisan package:discover
 php artisan ninja:react
 
 # Check if DB works, if not crash the app.