4.5.14

Dockerfile

@@ -1,22 +1,37 @@
-FROM php:7.2-fpm
+ARG PHP_IMAGE_TAG=7.2-fpm
+FROM php:${PHP_IMAGE_TAG}
 
-MAINTAINER Samuel Laulhau <sam@lalop.co>
+LABEL maintainer="Samuel Laulhau <sam@lalop.co>"
 
 #####
 # SYSTEM REQUIREMENT
 #####
-ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
+ENV BUILD_DEPS \
+        zlib1g-dev \
+        git \
+        libgmp-dev \
+        unzip \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libpng-dev \
+        build-essential \
+        chrpath \
+        libssl-dev \
+        libxft-dev \
+        libfreetype6 \
+        libfontconfig1 \
+        libfontconfig1-dev
+
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
+    && apt-get install -y --no-install-recommends $BUILD_DEPS \
-        zlib1g-dev git libgmp-dev unzip \
-        libfreetype6-dev libjpeg62-turbo-dev libpng-dev \
-        build-essential chrpath libssl-dev libxft-dev \
-        libfreetype6 libfontconfig1 libfontconfig1-dev \
     && ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/ \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
     && docker-php-ext-configure gmp \
-    && docker-php-ext-install iconv mbstring pdo pdo_mysql zip gd gmp opcache \
+    && docker-php-ext-install iconv mbstring pdo pdo_mysql zip gd gmp opcache
-    && curl -o ${PHANTOMJS}.tar.bz2 -SL https://bitbucket.org/ariya/phantomjs/downloads/${PHANTOMJS}.tar.bz2 \
+
+ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
+# Install PHANTOMJS
+RUN curl -o ${PHANTOMJS}.tar.bz2 -SL https://bitbucket.org/ariya/phantomjs/downloads/${PHANTOMJS}.tar.bz2 \
     && tar xvjf ${PHANTOMJS}.tar.bz2 \
     && rm ${PHANTOMJS}.tar.bz2 \
     && mv ${PHANTOMJS} /usr/local/share \
@@ -38,7 +53,7 @@ RUN { \
 # DOWNLOAD AND INSTALL INVOICE NINJA
 #####
 
-ENV INVOICENINJA_VERSION 4.5.10
+ENV INVOICENINJA_VERSION 4.5.14
 
 RUN curl -o ninja.zip -SL https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \
     && unzip ninja.zip -d /var/www/ \

alpine/Dockerfile

@@ -1,6 +1,7 @@
-FROM php:7.2-fpm-alpine
+ARG PHP_IMAGE_TAG=7.2-fpm-alpine
+FROM php:${PHP_IMAGE_TAG}
 
-MAINTAINER Samuel Laulhau <sam@lalop.co>
+LABEL maintainer="Samuel Laulhau <sam@lalop.co>"
 
 #####
 # SYSTEM REQUIREMENT
@@ -35,7 +36,7 @@ RUN { \
 # DOWNLOAD AND INSTALL INVOICE NINJA
 #####
 
-ENV INVOICENINJA_VERSION 4.5.10
+ENV INVOICENINJA_VERSION 4.5.14
 
 RUN curl -o ninja.zip -SL https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \
     && unzip ninja.zip -d /var/www/ \

docker-compose/docker-compose.yml

@@ -1,4 +1,15 @@
-version: "2"
+version: '3.6'
+
+volumes:
+  db:
+  storage:
+  logo:
+  public:
+
+# uncomment if you want to use external network (example network: "web")
+#networks:
+#  web:
+#    external: true
 
 services:
   db:
@@ -6,36 +17,45 @@ services:
     env_file: .env
     restart: always
     volumes:
-      - data-volume:/var/lib/mysql
+      - db:/var/lib/mysql
+    networks:
+      - default
 
   app:
     image: invoiceninja/invoiceninja
-    links:
-      - db:mysql
     env_file: .env
     restart: always
+    depends_on:
+      - db
     volumes:
-      - ./srv/invoiceninja/storage:/var/www/app/storage:rw
+      -  storage:/var/www/app/storage
-      - ./srv/invoiceninja/logo:/var/www/app/public/logo:rw
+      -  logo:/var/www/app/public/logo
+      -  public:/var/www/app/public
+    networks: 
+      - default  
 
   web:
     image: nginx:1
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
-    links:
+      -  storage:/var/www/app/storage
-      - app
+      -  logo:/var/www/app/public/logo
-    volumes_from:
+      -  public:/var/www/app/public
-      - app
+    expose: # Expose ports without publishing them to the host machine - they’ll only be accessible to linked services.
-    ports:
+      - "80"
+    ports: # Delete if you want to use reverse proxy
       - 8000:80
+    networks:
+#      - web        # uncomment if you want to use  external network (reverse proxy for example)
+      - default
 
   cron:
     image: invoiceninja/invoiceninja
-    links:
-      - db:mysql
     env_file: .env
-    volumes_from:
+    volumes:
-      - app
+      -  storage:/var/www/app/storage
+      -  logo:/var/www/app/public/logo
+      -  public:/var/www/app/public
     entrypoint: |
       bash -c 'bash -s <<EOF
       trap "break;exit" SIGHUP SIGINT SIGTERM
@@ -46,7 +66,5 @@ services:
         sleep 1d
       done
       EOF'
-
+    networks:
-volumes:
+      - default
-  data-volume:
-