2.6

fix #7

Dockerfile

@@ -1,16 +1,18 @@
 FROM php:fpm
 
-MAINTAINER Samuel Laulhau
+MAINTAINER Samuel Laulhau <sam@lalop.co>
 
 #####
 # SYSTEM REQUIREMENT
 #####
 RUN apt-get update \
-    && apt-get install -y \
-        libmcrypt-dev zlib1g-dev git \
-        libfreetype6-dev libjpeg62-turbo-dev libpng12-dev\
+    && 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-install iconv mcrypt mbstring pdo pdo_mysql zip gd \
+    && docker-php-ext-configure gmp \
+    && docker-php-ext-install iconv mcrypt mbstring pdo pdo_mysql zip gd gmp \
     && rm -rf /var/lib/apt/lists/*
 
 #####
@@ -23,16 +25,15 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 # DOWNLOAD AND INSTALL INVOICE NINJA
 #####
 
-ENV INVOICENINJA_VERSION 2.5.1.1
-#ENV INVOICENINJA_SHA1 3e9b63c1681b6923dc1a24399411c1abde6ef5ea
+ENV INVOICENINJA_VERSION 2.6
 
 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 -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  --prefer-source\
+    && 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
 

README.md

@@ -1,3 +1,31 @@
 DockerFile for invoice ninja (https://www.invoiceninja.com/)
 
-To test Invoice Ninja you can clone this repos and run `docker-compose up`.
+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

@@ -13,23 +13,23 @@ echo "DB_USERNAME=$DB_USERNAME" >> .env
 echo "DB_PASSWORD=$DB_PASSWORD" >> .env
 
 if [ ! -d /var/www/app/storage ]; then
-	mv /var/www/app/docker-backup-storage /var/www/app/storage
+	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
-			mv "/var/www/app/docker-backup-storage/$path" "/var/www/app/storage/"
+			cp -Rp "/var/www/app/docker-backup-storage/$path" "/var/www/app/storage/"
 		fi
 	done
 fi
 
 if [ ! -d /var/www/app/public/logo ]; then
-	mv /var/www/app/docker-backup-public-logo /var/www/app/public/logo
+	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
-			mv "/var/www/app/docker-backup-public-logo/$path" "/var/www/app/public/logo/"
+			cp -Rp "/var/www/app/docker-backup-public-logo/$path" "/var/www/app/public/logo/"
 		fi
 	done
 fi

docker-compose.yml

@@ -1,21 +0,0 @@
-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