Merge pull request #222 from turbo124/master

Fixes for lib jpg and freetype for php7.4

alpine/Dockerfile_v5

@@ -1,4 +1,4 @@
-ARG PHP_VERSION=7.3
+ARG PHP_VERSION=7.4
 
 # Get Invoice Ninja
 FROM alpine:latest as base
@@ -7,6 +7,8 @@ ARG INVOICENINJA_VERSION
 RUN set -eux; \
     apk add --no-cache \
     curl \
+    mysql-client \
+    git \
     libarchive-tools; \
     mkdir -p /var/www/app
 
@@ -45,13 +47,14 @@ RUN set -eux; \
     apk add --no-cache \
     nodejs \
     npm \
+    mysql-client \
     freetype-dev \
     gmp-dev \
     libjpeg-turbo-dev \
     libpng-dev \
-    libzip-dev; \
-    docker-php-ext-configure zip --with-libzip; \
-    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/; \
+    libzip-dev \
+    zip; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg \
     docker-php-ext-install -j$(nproc) \
         bcmath \
         exif \
@@ -100,8 +103,7 @@ RUN addgroup -S "$INVOICENINJA_USER" && \
     chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app
 
 # Install Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer; \
-    composer global require hirak/prestissimo;
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer; 
 
 ## Set up the cronjob and run cron daemon
 RUN echo "* * * * * run-parts /etc/periodic/1min" >> /etc/crontabs/root
@@ -111,11 +113,13 @@ RUN chown $INVOICENINJA_USER /etc/periodic/1min/invoiceninja_cronjob && \
 
 USER $INVOICENINJA_USER
 
-RUN composer install --no-dev --no-suggest --no-progress --quiet
+RUN /usr/local/bin/composer install --no-dev --no-suggest --no-progress --quiet
 
 # Override the environment settings from projects .env file
 ENV APP_ENV production
 ENV LOG errorlog
 
+RUN php artisan storage:link
+
 ENTRYPOINT ["docker-entrypoint"]
 CMD ["php-fpm"]

docker-compose.yml

@@ -37,6 +37,9 @@ services:
       - APP_KEY=<INSERT THE GENERATED APPLICATION KEY HERE>
       - MULTI_DB_ENABLED=false
       - DB_HOST1=db
+      - DB_USERNAME1=ninja
+      - DB_PASSWORD1=ninja
+      - DB_DATABASE1=ninja
     volumes:
       # Configure your mounted directories, make sure the folder 'public' and 'storage'
       # exist, before mounting them
@@ -93,4 +96,4 @@ volumes:
   # logo:
 
 networks:
-  invoiceninja:
+  invoiceninja: