3.3.3

3.3.1
fix alpine error
2026-01-01 12:07:26 +01:00 · 2017-05-16 09:38:58 +02:00 · 2017-05-10 09:09:46 +02:00 · 2017-05-03 16:15:34 +02:00 · 2017-05-03 14:37:55 +02:00 · 2017-05-03 11:28:15 +02:00
4 changed files with 165 additions and 19 deletions
--- a/15
+++ b/15
@@ -15,13 +15,24 @@ RUN apt-get update \
    && 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 \
+    && docker-php-ext-install iconv mcrypt mbstring pdo pdo_mysql zip gd gmp opcache \
    && 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 \
    && ln -sf /usr/local/share/${PHANTOMJS}/bin/phantomjs /usr/local/bin \
    && rm -rf /var/lib/apt/lists/*
+    
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=60'; \
+		echo 'opcache.fast_shutdown=1'; \
+		echo 'opcache.enable_cli=1'; \
+} > /usr/local/etc/php/conf.d/opcache-recommended.ini

 #####
 # INSTALL COMPOSER
@@ -33,7 +44,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 # DOWNLOAD AND INSTALL INVOICE NINJA
 #####

-ENV INVOICENINJA_VERSION 3.1.1
+ENV INVOICENINJA_VERSION 3.3.3

 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/ \
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -0,0 +1,93 @@
+FROM php:7.0-fpm-alpine
+
+MAINTAINER Samuel Laulhau <sam@lalop.co>
+
+#####
+# SYSTEM REQUIREMENT
+#####
+ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
+RUN apk update
+RUN apk add libmcrypt-dev
+# RUN apk add zlib1g-dev
+RUN apk add git
+RUN apk add gmp-dev
+RUN apk add freetype-dev
+RUN apk add libjpeg-turbo-dev
+RUN apk add libpng-dev
+RUN apk add coreutils
+RUN apk add chrpath 
+# RUN apk add libssl-dev 
+# RUN apk add libxft-dev \
+        # libfreetype6 libfontconfig1 libfontconfig1-dev \
+RUN 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 \
+    && 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 \
+    && ln -sf /usr/local/share/${PHANTOMJS}/bin/phantomjs /usr/local/bin \
+    && rm -rf /var/lib/apt/lists/* \
+    && echo "php_admin_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED">>/usr/local/etc/php-fpm.d/www.conf
+
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=60'; \
+		echo 'opcache.fast_shutdown=1'; \
+		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 3.3.3
+
+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
+
+
+######
+# 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
+
+
+#use to be mounted into nginx for exemple
+VOLUME /var/www/app/public
+
+WORKDIR /var/www/app
+
+COPY entrypoint.sh /usr/local/bin/invoice-entrypoint
+# RUN chmod +x /usr/local/bin/invoice-entrypoint
+
+ENTRYPOINT ["invoice-entrypoint"]
+CMD ["php-fpm"]
--- a/alpine/entrypoint.sh
+++ b/alpine/entrypoint.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+set -e
+
+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
+
+# compare public volume version with image version
+if [ ! -e /var/www/app/public/version ] || [ "$INVOICENINJA_VERSION" != "$(cat /var/www/app/public/version)" ]; then
+  echo 'clone public directory'
+  cp -Rp /var/www/app/docker-backup-public/* /var/www/app/public/
+  echo $INVOICENINJA_VERSION > /var/www/app/public/version
+fi
+
+#php artisan optimize --force
+#php artisan migrate --force
+
+#if [ ! -e "/var/www/app/is-seeded" ]; then
+	#php artisan db:seed --force
+	#touch "/var/www/app/is-seeded"
+#fi
+
+echo 'start'
+exec "$@"
--- a/example/docker-compose.yml
+++ b/example/docker-compose.yml
@@ -24,20 +24,20 @@ services:
    ports:
      - 8000:80

-  cron:
-    image: invoiceninja/invoiceninja
-    links:
-      - db:mysql
-    env_file: .env
-    volumes_from:
-      - app
-    entrypoint: |
-      bash -c 'bash -s <<EOF
-      trap "break;exit" SIGHUP SIGINT SIGTERM
-      sleep 300s
-      while /bin/true; do
-        /usr/local/bin/php /var/www/app/artisan ninja:send-invoices
-        /usr/local/bin/php /var/www/app/artisan ninja:send-reminders
-        sleep 1d
-      done
-      EOF'
+  # cron:
+  #   image: invoiceninja/invoiceninja
+  #   links:
+  #     - db:mysql
+  #   env_file: .env
+  #   volumes_from:
+  #     - app
+  #   entrypoint: |
+  #     bash -c 'bash -s <<EOF
+  #     trap "break;exit" SIGHUP SIGINT SIGTERM
+  #     sleep 300s
+  #     while /bin/true; do
+  #       /usr/local/bin/php /var/www/app/artisan ninja:send-invoices
+  #       /usr/local/bin/php /var/www/app/artisan ninja:send-reminders
+  #       sleep 1d
+  #     done
+  #     EOF'
Author	SHA1	Message	Date
Sam	0ed2a1cf4c	3.3.3	2017-05-16 09:38:58 +02:00
Sam	43bb842598	3.3.1	2017-05-10 09:09:46 +02:00
Sam	8c1c2488bd	fix alpine error	2017-05-03 16:15:34 +02:00
Sam	baf2459f72	alpine error fix	2017-05-03 14:37:55 +02:00
Sam	89ad8ad2bf	fix alpine chown	2017-05-03 11:28:15 +02:00
Sam	d80a0fa212	3.3.0	2017-05-03 10:51:13 +02:00
Sam	bce728b558	dedebug exemple	2017-04-25 12:20:59 +02:00
Sam	23a8241d13	alpine 3.2.1	2017-04-25 12:02:06 +02:00
Sam	302da0c895	add opcahce	2017-04-25 11:24:33 +02:00
Sam	81075f2595	alpine working image	2017-04-25 11:17:51 +02:00
Sam	fae767223f	alpine image first draft	2017-04-25 11:17:51 +02:00
Sam	a896a49e48	add opcahce	2017-04-25 11:13:50 +02:00
Sam	4d00017b2a	3.2.1	2017-04-23 19:54:06 +02:00
Sam	9601557224	3.2.0	2017-04-03 11:07:27 +02:00
Sam	5b1bb1f277	3.1.3	2017-03-23 09:14:23 +01:00
Sam	2208768dfe	3.1.2	2017-03-13 16:59:11 +01:00