Merge pull request #608 from turbo124/master

Add intl extension

alpine/5/Dockerfile

@@ -7,9 +7,14 @@ FROM --platform=$BUILDPLATFORM node:lts-alpine as nodebuild
 
 # Download Invoice Ninja
 ARG INVOICENINJA_VERSION
-ADD https://github.com/invoiceninja/invoiceninja/releases/download/v$INVOICENINJA_VERSION/react-invoiceninja.tar /tmp/ninja.tar
+ARG REPOSITORY=invoiceninja/invoiceninja
+ARG FILENAME=invoiceninja.tar
 
-RUN set -eux; apk add curl unzip
+RUN set -eux; apk add curl unzip grep
+
+RUN DOWNLOAD_URL=$(curl -s "https://api.github.com/repos/invoiceninja/invoiceninja/releases/latest" | grep -o '"browser_download_url": "[^"]*invoiceninja.tar"' | cut -d '"' -f 4) && \
+    curl -LJO "$DOWNLOAD_URL" && \
+    mv invoiceninja.tar /tmp/ninja.tar
 
 # Extract Invoice Ninja
 RUN mkdir -p /var/www/app \
@@ -18,10 +23,6 @@ RUN mkdir -p /var/www/app \
     
 WORKDIR /var/www/app
 
-RUN echo ls -l
-
-RUN cp /var/www/app/ui/dist/index.html /var/www/app/resources/views/react/index.blade.php
-
 # Prepare php image
 FROM php:${PHP_VERSION}-fpm-alpine as phpbuild
 
@@ -44,7 +45,8 @@ RUN set -eux; \
     supervisor \
     mysql-client \
     chromium \
-    ttf-freefont
+    ttf-freefont \
+    ttf-dejavu
 
 RUN install-php-extensions \
     bcmath \
@@ -55,6 +57,7 @@ RUN install-php-extensions \
     opcache \
     pdo_mysql \
     zip \
+    intl \
     @composer \
     && rm /usr/local/bin/install-php-extensions
 

config/php/php.ini

@@ -4,7 +4,7 @@ short_open_tag = Off
 error_reporting = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED
 
 ; opcache.enable=1
-; opcache.preload=/srv/www/invoiceninja/current/preload.php
+; opcache.preload=/var/www/app/preload.php
 ; opcache.preload_user=www-data
 
 ; ; The OPcache shared memory storage size.
@@ -18,4 +18,4 @@ error_reporting = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED
 
 post_max_size = 60M
 upload_max_filesize = 50M
-memory_limit=512M
+memory_limit=512M

docker-compose.yml

@@ -47,8 +47,6 @@ services:
 #    For auto DB backups comment out image and use the build block below
 #    build:
 #      context: ./config/mysql
-    ports:
-      - "3305:3306"
     restart: always
     env_file: env
     volumes: