4.5.14

Dockerfile

@@ -1,22 +1,37 @@
-FROM php:7.0-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 \
-        libmcrypt-dev zlib1g-dev git libgmp-dev \
-        libfreetype6-dev libjpeg62-turbo-dev libpng12-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 mcrypt 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 \
@@ -34,41 +49,28 @@ RUN { \
 		echo 'opcache.enable_cli=1'; \
 } > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-#####
-# INSTALL COMPOSER
-#####
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-
 #####
 # DOWNLOAD AND INSTALL INVOICE NINJA
 #####
 
-ENV INVOICENINJA_VERSION 4.1.1
+ENV INVOICENINJA_VERSION 4.5.14
-
-RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja/archive/v${INVOICENINJA_VERSION}.tar.gz \
-    && tar -xzf invoiceninja.tar.gz -C /var/www/ \
-    && rm invoiceninja.tar.gz \
-    && mv /var/www/invoiceninja-${INVOICENINJA_VERSION} /var/www/app \
-    && chown -R www-data:www-data /var/www/app \
-    && composer install --working-dir /var/www/app -o --no-dev --no-interaction --no-progress \
-    && chown -R www-data:www-data /var/www/app/bootstrap/cache \
-    && mv /var/www/app/storage /var/www/app/docker-backup-storage \
-    && mv /var/www/app/public /var/www/app/docker-backup-public \
-    && rm -rf /var/www/app/docs /var/www/app/tests
 
+RUN curl -o ninja.zip -SL https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \
+    && unzip ninja.zip -d /var/www/ \
+    && rm ninja.zip \
+    && mv /var/www/ninja /var/www/app  \
+    && mv /var/www/app/storage /var/www/app/docker-backup-storage  \
+    && mv /var/www/app/public /var/www/app/docker-backup-public  \
+    && mkdir -p /var/www/app/public/logo /var/www/app/storage \
+    && touch /var/www/app/.env \
+    && chmod -R 755 /var/www/app/storage  \
+    && chown -R www-data:www-data /var/www/app/storage /var/www/app/bootstrap /var/www/app/public/logo /var/www/app/.env /var/www/app/docker-backup-storage /var/www/app/docker-backup-public\
+    && rm -rf /var/www/app/docs /var/www/app/tests /var/www/ninja
 
 ######
 # DEFAULT ENV
 ######
-ENV DB_HOST mysql
-ENV DB_DATABASE ninja
-ENV DB_USERNAME ninja
-ENV DB_PASSWORD ninja
-ENV APP_KEY SomeRandomString
 ENV LOG errorlog
-ENV APP_DEBUG 0
-ENV APP_CIPHER rijndael-128
 ENV SELF_UPDATER_SOURCE ''
 ENV PHANTOMJS_BIN_PATH /usr/local/bin/phantomjs
 
@@ -79,7 +81,6 @@ VOLUME /var/www/app/public
 WORKDIR /var/www/app
 
 COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-fpm"]

README.md

@@ -10,19 +10,19 @@ To make your data persistent, you have to mount `/var/www/app/public/logo` and `
 To run it:
 
 ```
-docker run -d
+docker run -d \
-  -e APP_ENV='production'
+  -e APP_ENV='production' \
-  -e APP_DEBUG=0
+  -e APP_DEBUG=0 \
-  -e APP_URL='http://ninja.dev'
+  -e APP_URL='http://ninja.dev' \
-  -e APP_KEY='SomeRandomStringSomeRandomString'
+  -e APP_KEY='SomeRandomStringSomeRandomString' \
-  -e APP_CIPHER='AES-256-CBC'
+  -e APP_CIPHER='AES-256-CBC' \
-  -e DB_TYPE='mysql'
+  -e DB_TYPE='mysql' \
-  -e DB_STRICT='false'
+  -e DB_STRICT='false' \
-  -e DB_HOST='localhost'
+  -e DB_HOST='localhost' \
-  -e DB_DATABASE='ninja'
+  -e DB_DATABASE='ninja' \
-  -e DB_USERNAME='ninja'
+  -e DB_USERNAME='ninja' \
-  -e DB_PASSWORD='ninja'
+  -e DB_PASSWORD='ninja' \
-  -p '80:80'
+  -p '80:80' \
   invoiceninja/invoiceninja
 ```
 A list of environment variables can be found [here](https://github.com/invoiceninja/invoiceninja/blob/master/.env.example)

alpine/Dockerfile

@@ -1,19 +1,19 @@
-FROM php:7.0-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
 #####
 ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
 RUN apk update \
- && apk add --no-cache libmcrypt-dev git gmp-dev freetype-dev libjpeg-turbo-dev \
+ && apk add --no-cache git gmp-dev freetype-dev libjpeg-turbo-dev \
             coreutils chrpath fontconfig libpng-dev
 
-RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/ \
+RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/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 mcrypt mbstring pdo pdo_mysql zip gd gmp opcache \
+    && docker-php-ext-install iconv mbstring pdo pdo_mysql zip gd gmp opcache \
     && echo "php_admin_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED">>/usr/local/etc/php-fpm.d/www.conf
     
 RUN cd /usr/share \
@@ -32,41 +32,27 @@ RUN { \
 		echo 'opcache.enable_cli=1'; \
 } > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-#####
-# INSTALL COMPOSER
-#####
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-
 #####
 # DOWNLOAD AND INSTALL INVOICE NINJA
 #####
 
-ENV INVOICENINJA_VERSION 4.1.1
+ENV INVOICENINJA_VERSION 4.5.14
-
-RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja/archive/v${INVOICENINJA_VERSION}.tar.gz \
-    && tar -xzf invoiceninja.tar.gz -C /var/www/ \
-    && rm invoiceninja.tar.gz \
-    && mv /var/www/invoiceninja-${INVOICENINJA_VERSION} /var/www/app \
-    && chown -R www-data:www-data /var/www/app \
-    && composer install --working-dir /var/www/app -o --no-dev --no-interaction --no-progress \
-    && chown -R www-data:www-data /var/www/app/bootstrap/cache \
-    && mv /var/www/app/storage /var/www/app/docker-backup-storage \
-    && mv /var/www/app/public /var/www/app/docker-backup-public \
-    && rm -rf /var/www/app/docs /var/www/app/tests
 
+RUN curl -o ninja.zip -SL https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \
+    && unzip ninja.zip -d /var/www/ \
+    && rm ninja.zip \
+    && mv /var/www/ninja /var/www/app  \
+    && mv /var/www/app/storage /var/www/app/docker-backup-storage  \
+    && mv /var/www/app/public /var/www/app/docker-backup-public  \
+    && mkdir -p /var/www/app/public/logo /var/www/app/storage \
+    && touch /var/www/app/.env \
+    && chmod -R 755 /var/www/app/storage  \
+    && rm -rf /var/www/app/docs /var/www/app/tests /var/www/ninja
 
 ######
 # DEFAULT ENV
 ######
-ENV DB_HOST mysql
-ENV DB_DATABASE ninja
-ENV DB_USERNAME ninja
-ENV DB_PASSWORD ninja
-ENV APP_KEY SomeRandomString
 ENV LOG errorlog
-ENV APP_DEBUG 0
-ENV APP_CIPHER rijndael-128
 ENV SELF_UPDATER_SOURCE ''
 ENV PHANTOMJS_BIN_PATH /usr/local/bin/phantomjs
 

alpine/entrypoint.sh

@@ -30,6 +30,11 @@ if [ ! -e /var/www/app/public/version ] || [ "$INVOICENINJA_VERSION" != "$(cat /
   echo $INVOICENINJA_VERSION > /var/www/app/public/version
 fi
 
+# fix permission for monted directories
+chown www-data:www-data /var/www/app/storage
+chown www-data:www-data /var/www/app/public/logo
+
+
 #php artisan optimize --force
 #php artisan migrate --force
 

docker-compose/.env.example

@@ -8,6 +8,7 @@ APP_CIPHER=AES-256-CBC
 DB_USERNAME=root
 DB_PASSWORD=pwd
 DB_HOST=mysql
+DB_DATABASE=ninja
 MAIL_HOST=mail.service.host
 MAIL_USERNAME=username
 MAIL_PASSWORD=password

docker-compose/docker-compose.yml

@@ -1,41 +1,61 @@
-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:
-    image: mysql
+    image: mysql:5
     env_file: .env
     restart: always
     volumes:
-      - ./srv/invoiceninja/mysql:/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
+    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
@@ -43,7 +63,8 @@ services:
       while /bin/true; do
         ./artisan ninja:send-invoices
         ./artisan ninja:send-reminders
-        sleep 1h
+        sleep 1d
       done
       EOF'
-      
+    networks:
+      - default

entrypoint.sh

@@ -30,6 +30,10 @@ if [ ! -e /var/www/app/public/version ] || [ "$INVOICENINJA_VERSION" != "$(cat /
   echo $INVOICENINJA_VERSION > /var/www/app/public/version
 fi
 
+# fix permission for monted directories
+chown www-data:www-data /var/www/app/storage
+chown	 www-data:www-data /var/www/app/public/logo
+
 #php artisan optimize --force
 #php artisan migrate --force