Merge pull request #541 from turbo124/master

Fixes for vite build

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/
 
@@ -20,7 +20,13 @@ RUN mkdir -p /var/www/app \
 RUN curl -LGO $(curl https://api.github.com/repos/invoiceninja/ui/releases/latest | grep "browser_download_url" | awk '{ print $2 }' | sed 's/,$//' | sed 's/"//g');
 RUN cp invoiceninja-react.zip /tmp/invoiceninja-react.zip
 RUN unzip /tmp/invoiceninja-react.zip 
+RUN mkdir  /var/www/app/public/react/v$INVOICENINJA_VERSION/
+RUN cp -r dist/react/* /var/www/app/public/react/v$INVOICENINJA_VERSION/
 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/
@@ -29,13 +35,13 @@ WORKDIR /var/www/app/
 ARG BAK_STORAGE_PATH
 ARG BAK_PUBLIC_PATH
 RUN --mount=target=/var/www/app/node_modules,type=cache \
-    npm install --production \
+    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-alpine3.15 as prod
+FROM php:${PHP_VERSION}-fpm-alpine as prod
 
 LABEL maintainer="David Bomba <turbo124@gmail.com>"
 
@@ -100,7 +106,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.

charts/invoiceninja/Chart.yaml

@@ -13,11 +13,11 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.10.1
+version: 0.10.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 5.5.49
+appVersion: 5.6.24
 keywords:
   - invoiceninja
 home: https://invoiceninja.github.io/dockerfiles

charts/invoiceninja/values.yaml

@@ -18,7 +18,7 @@
 image:
   registry: docker.io
   repository: invoiceninja/invoiceninja
-  tag: 5.5.49
+  tag: 5.6.24
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
   ##

config/nginx/in-vhost.conf

@@ -16,6 +16,11 @@ server {
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }
 
+
+    location ~* /storage/.*\.php$ {
+        return 503;
+    }
+
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass app:9000;