Merge pull request #560 from turbo124/master

Updates for broken build pipeline

alpine/5/Dockerfile

@@ -20,26 +20,20 @@ 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/
-
-# Install node packages
-ARG BAK_STORAGE_PATH
-ARG BAK_PUBLIC_PATH
-RUN --mount=target=/var/www/app/node_modules,type=cache \
-    npm install --production \
-    && 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 <turbo124@gmail.com>"
 
 # Adding caching_sha2_password.so
@@ -106,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

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;