4.5.2

chmod entrypoint in repo
remove old env in alpine
2026-01-01 03:57:25 +01:00 · 2018-08-08 23:06:15 +02:00 · 2018-07-29 16:55:52 +02:00 · 2018-07-29 16:52:39 +02:00 · 2018-07-29 16:49:39 +02:00 · 2018-07-29 16:33:11 +02:00
6 changed files with 43 additions and 55 deletions
--- a/39
+++ b/39
@@ -1,4 +1,4 @@
-FROM php:7.0-fpm
+FROM php:7.2-fpm

 MAINTAINER Samuel Laulhau <sam@lalop.co>

@@ -8,14 +8,14 @@ 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 \
-        libmcrypt-dev zlib1g-dev git libgmp-dev \
-        libfreetype6-dev libjpeg62-turbo-dev libpng12-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 \
    && 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 \
    && tar xvjf ${PHANTOMJS}.tar.bz2 \
    && rm ${PHANTOMJS}.tar.bz2 \
@@ -34,29 +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.2.2
-
-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
+ENV INVOICENINJA_VERSION 4.5.2

+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
@@ -72,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"]
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.0-fpm-alpine
+FROM php:7.2-fpm-alpine

 MAINTAINER Samuel Laulhau <sam@lalop.co>

@@ -7,13 +7,12 @@ MAINTAINER Samuel Laulhau <sam@lalop.co>
 #####
 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/ \
-    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+RUN 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 +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.2.2
-
-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
+ENV INVOICENINJA_VERSION 4.5.2

+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

--- a/alpine/entrypoint.sh
+++ b/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

--- a/docker-compose/.env.example
+++ b/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
--- a/docker-compose/docker-compose.yml
+++ b/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:
--- a/entrypoint.sh
+++ b/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
Author	SHA1	Message	Date
Sam	e0332086d4	4.5.2	2018-08-08 23:06:15 +02:00
Sam	63ffa18860	chmod entrypoint in repo	2018-07-29 16:55:52 +02:00
Sam	960c3172e9	remove old env in alpine	2018-07-29 16:52:39 +02:00
Sam	43ff450c2d	avoid using copy --from in alpine	2018-07-29 16:49:39 +02:00
Sam	aaa6118286	remove "ln gmp.h" command in alpine	2018-07-29 16:33:11 +02:00
Sam	1ab7bc02d6	4.5.1	2018-07-19 18:48:16 +02:00
Sam	9625d9d9d0	4.5.0	2018-07-09 11:09:25 +02:00
Sam	3bd5324136	chown mounted dir	2018-07-04 22:07:24 +02:00
Sam	e28c8dc07b	4.4.4	2018-06-11 09:12:30 +02:00
Sam	4ab4039887	4.4.3	2018-05-15 20:08:35 +02:00
Sam	650851811a	chown backup	2018-05-10 10:03:25 +02:00
Sam	72762dc964	4.4.2	2018-05-03 09:41:03 +02:00
Sam	dc66ca0544	4.4.1	2018-04-30 16:21:31 +02:00
Sam	52992d622b	use mysql 5 in docker-compose	2018-04-30 16:21:00 +02:00
Sam	9dcf825f85	chown .env	2018-04-25 14:15:04 +02:00
Sam	350a9fad35	4.4.0	2018-04-25 09:59:49 +02:00
Sam	d8ca192f8e	use official Invoice Ninja package	2018-04-24 15:16:33 +02:00
Sam	b6d213682d	composer optim	2018-04-24 10:06:13 +02:00
Sam	0d88a6268f	fix nginx and mysql version in docker-compose	2018-04-24 10:05:47 +02:00
Sam	c641680309	optim dockerfile	2018-04-23 18:06:28 +02:00
Sam	47116c7d78	add DB_DATABASE in docker-compose exemple	2018-04-23 18:06:19 +02:00
Sam	41544ec1e0	4.3.1	2018-04-09 11:53:45 +02:00
Sam	f3b5a62d36	4.3.0	2018-04-08 10:13:25 +02:00
Sam	69d2f54b03	php 7.2	2018-04-05 14:29:10 +02:00
Sam	5a1c1c16d7	fix clean composer	2018-04-04 16:57:39 +02:00
Sam	3ade74efc9	fix Dockerfile	2018-04-04 12:46:21 +02:00
Sam	dc00f6a604	rm composer after build	2018-04-04 12:30:58 +02:00