2.6.11

fix #7

Dockerfile

@@ -1,11 +1,19 @@
 FROM php:fpm
 
+MAINTAINER Samuel Laulhau <sam@lalop.co>
+
 #####
 # SYSTEM REQUIREMENT
 #####
 RUN apt-get update \
-    && apt-get install -y libmcrypt-dev zlib1g-dev git\
-    && docker-php-ext-install iconv mcrypt mbstring pdo pdo_mysql zip
+    && apt-get install -y --no-install-recommends \
+        libmcrypt-dev zlib1g-dev git libgmp-dev \
+        libfreetype6-dev libjpeg62-turbo-dev libpng12-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 \
+    && rm -rf /var/lib/apt/lists/*
 
 #####
 # INSTALL COMPOSER
@@ -14,40 +22,43 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 
 
 #####
-# DOWNLOAD AND INSTALL INVOICE NONJA
+# DOWNLOAD AND INSTALL INVOICE NINJA
 #####
 
-WORKDIR /var/www/
-
-ENV INVOICENINJA_VERSION 2.4.3
-#ENV INVOICENINJA_SHA1 3e9b63c1681b6923dc1a24399411c1abde6ef5ea
+ENV INVOICENINJA_VERSION 2.6.11
 
 RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja/archive/v${INVOICENINJA_VERSION}.tar.gz \
-#	&& echo "$INVOICENINJA_SHA1 *invoiceninja.tar.gz" | sha1sum -c - \
-	&& tar -xzf invoiceninja.tar.gz \
-    && mv invoice-ninja-${INVOICENINJA_VERSION} app \
-    && rm -rf html \
-    && ln -s app/public html \
-	&& rm invoiceninja.tar.gz \
-#	&& chown -R www-data:www-data /var/www/ \
-    && composer install --working-dir app -o
+    && 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/logo /var/www/app/docker-backup-public-logo
 
 
 ######
 # DEFAULT ENV
 ######
 ENV DB_HOST mysql
+ENV DB_DATABASE ninja
 ENV APP_KEY SomeRandomString
 ENV LOG errorlog
 ENV APP_DEBUG 0
+ENV APP_CIPHER rijndael-128
+ENV SELF_UPDATER_SOURCE ''
 
 
 #use to be mounted into nginx for exemple
-VOLUME /var/www/html
+VOLUME /var/www/app/public
 
-VOLUME /var/www/app/storage
-VOLUME /var/www/app/public/logo
+WORKDIR /var/www/app
 
 EXPOSE 80
 
+COPY app-entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-fpm"]

README.md

@@ -1 +1,31 @@
 DockerFile for invoice ninja (https://www.invoiceninja.com/)
+
+This image is based on `php:7` official version.
+
+The easiest way to try this image is via docker compose :
+
+```
+db:
+  image: mysql
+  environment:
+    MYSQL_DATABASE: ninja
+    MYSQL_ROOT_PASSWORD: mdp
+
+app:
+  image: invoiceninja/invoiceninja
+  links:
+    - db:mysql
+
+web:
+  image: nginx
+  volumes:
+    - ./nginx.conf:/etc/nginx/nginx.conf:ro
+  links:
+    - app
+  volumes_from:
+    - app
+  ports:
+    - 80
+```
+
+To make your data persistant, you have to mount `/var/www/app/public/logo` and `/var/www/app/storage`.

app-entrypoint.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -e
+
+
+# if we're linked to MySQL, and we're using the root user, and our linked
+# container has a default "root" password set up and passed through... :)
+: ${DB_USERNAME:=root}
+if [ "$DB_USERNAME" = 'root' ]; then
+	: ${DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
+fi
+
+echo "DB_USERNAME=$DB_USERNAME" >> .env
+echo "DB_PASSWORD=$DB_PASSWORD" >> .env
+
+if [ ! -d /var/www/app/storage ]; then
+	cp -Rp /var/www/app/docker-backup-storage /var/www/app/storage
+else
+	IN_STORAGE_BACKUP="$(ls /var/www/app/docker-backup-storage/)"
+	for path in $IN_STORAGE_BACKUP; do
+		if [ ! -e "/var/www/app/storage/$path" ]; then
+			cp -Rp "/var/www/app/docker-backup-storage/$path" "/var/www/app/storage/"
+		fi
+	done
+fi
+
+if [ ! -d /var/www/app/public/logo ]; then
+	cp -Rp /var/www/app/docker-backup-public-logo /var/www/app/public/logo
+else
+	IN_LOGO_BACKUP="$(ls /var/www/app/docker-backup-public-logo/)"
+	for path in $IN_LOGO_BACKUP; do
+		if [ ! -e "/var/www/app/public/logo/$path" ]; then
+			cp -Rp "/var/www/app/docker-backup-public-logo/$path" "/var/www/app/public/logo/"
+		fi
+	done
+fi
+
+chown www-data .env
+
+exec "$@"

docker-compose.yml

@@ -2,24 +2,14 @@ db:
   image: mysql
   environment:
     MYSQL_DATABASE: ninja
-    MYSQL_USER: user
-    MYSQL_PASSWORD: pass
     MYSQL_ROOT_PASSWORD: mdp
 
 app:
-  image: invoice-ninja
+  image: invoiceninja/invoiceninja
   links:
     - db:mysql
   environment:
-    - APP_DEBUG=true
-    - APP_KEY=invoicekeyinvoicekeyinvoicekey12
-    - DB_USERNAME=user
-    - DB_PASSWORD=pass
-    - DB_DATABASE=ninja
-    - DB_HOST=mysql
-  volumes:
-    - ./data/storage:/var/www/app/storage:rw
-    - ./data/logo:/var/www/app/public/logo:rw
+    APP_DEBUG: 1
 
 web:
   image: nginx

nginx.conf

@@ -17,7 +17,7 @@ http {
         listen      80 default;
         server_name your_ininja_site;
 
-        root /var/www/html;
+        root /var/www/app/public;
 
         index index.php;