4.5.6

Dockerfile

@@ -8,7 +8,7 @@ MAINTAINER Samuel Laulhau <sam@lalop.co>
 ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        zlib1g-dev git libgmp-dev \
+        zlib1g-dev git libgmp-dev unzip \
         libfreetype6-dev libjpeg62-turbo-dev libpng-dev \
         build-essential chrpath libssl-dev libxft-dev \
         libfreetype6 libfontconfig1 libfontconfig1-dev \
@@ -34,30 +34,23 @@ 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.3.1
+ENV INVOICENINJA_VERSION 4.5.6
-
-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 \
-    && rm /usr/local/bin/composer
 
+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
@@ -73,7 +66,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"]

alpine/Dockerfile

@@ -10,8 +10,7 @@ RUN apk update \
  && 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 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
@@ -32,41 +31,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.3.1
+ENV INVOICENINJA_VERSION 4.5.6
 
-RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja/archive/v${INVOICENINJA_VERSION}.tar.gz \
+RUN curl -o ninja.zip -SL https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \
-    && tar -xzf invoiceninja.tar.gz -C /var/www/ \
+    && unzip ninja.zip -d /var/www/ \
-    && rm invoiceninja.tar.gz \
+    && rm ninja.zip \
-    && mv /var/www/invoiceninja-${INVOICENINJA_VERSION} /var/www/app \
+    && mv /var/www/ninja /var/www/app  \
-    && chown -R www-data:www-data /var/www/app \
+    && mv /var/www/app/storage /var/www/app/docker-backup-storage  \
-    && composer install --working-dir /var/www/app -o --no-dev --no-interaction --no-progress \
+    && mv /var/www/app/public /var/www/app/docker-backup-public  \
-    && chown -R www-data:www-data /var/www/app/bootstrap/cache \
+    && mkdir -p /var/www/app/public/logo /var/www/app/storage \
-    && mv /var/www/app/storage /var/www/app/docker-backup-storage \
+    && touch /var/www/app/.env \
-    && mv /var/www/app/public /var/www/app/docker-backup-public \
+    && chmod -R 755 /var/www/app/storage  \
-    && rm -rf /var/www/app/docs /var/www/app/tests \
+    && rm -rf /var/www/app/docs /var/www/app/tests /var/www/ninja
-    && rm /usr/local/bin/composer
 
 ######
 # 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

@@ -2,7 +2,7 @@ version: "2"
 
 services:
   db:
-    image: mysql
+    image: mysql:5
     env_file: .env
     restart: always
     volumes:
@@ -19,7 +19,7 @@ services:
       - ./srv/invoiceninja/logo:/var/www/app/public/logo:rw
 
   web:
-    image: nginx
+    image: nginx:1
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
     links:
@@ -43,7 +43,7 @@ services:
       while /bin/true; do
         ./artisan ninja:send-invoices
         ./artisan ninja:send-reminders
-        sleep 1h
+        sleep 1d
       done
       EOF'
 

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