4.5.13

Update docker-compose.yml
Change Dockerfile, remove deprecated MAINTAINER section, separate stage on two
2026-01-01 12:07:26 +01:00 · 2019-05-27 10:35:50 +02:00 · 2019-03-27 14:34:16 +01:00 · 2019-03-27 14:34:16 +01:00 · 2019-03-26 09:59:53 +01:00 · 2019-03-04 21:04:24 +01:00
7 changed files with 115 additions and 94 deletions
--- a/67
+++ b/67
@@ -1,22 +1,37 @@
-FROM php:7.2-fpm
+ARG PHP_IMAGE_TAG=7.2-fpm
+FROM php:${PHP_IMAGE_TAG}

-MAINTAINER Samuel Laulhau <sam@lalop.co>
+LABEL maintainer="Samuel Laulhau <sam@lalop.co>"

 #####
 # SYSTEM REQUIREMENT
 #####
-ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
+ENV BUILD_DEPS \
+        zlib1g-dev \
+        git \
+        libgmp-dev \
+        unzip \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libpng-dev \
+        build-essential \
+        chrpath \
+        libssl-dev \
+        libxft-dev \
+        libfreetype6 \
+        libfontconfig1 \
+        libfontconfig1-dev
+
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        zlib1g-dev git libgmp-dev \
-        libfreetype6-dev libjpeg62-turbo-dev libpng-dev \
-        build-essential chrpath libssl-dev libxft-dev \
-        libfreetype6 libfontconfig1 libfontconfig1-dev \
+    && apt-get install -y --no-install-recommends $BUILD_DEPS \
    && 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 mbstring pdo pdo_mysql zip gd gmp opcache \
-    && curl -o ${PHANTOMJS}.tar.bz2 -SL https://bitbucket.org/ariya/phantomjs/downloads/${PHANTOMJS}.tar.bz2 \
+    && docker-php-ext-install iconv mbstring pdo pdo_mysql zip gd gmp opcache
+
+ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
+# Install PHANTOMJS
+RUN 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 \
@@ -34,30 +49,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.0
-
-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
+ENV INVOICENINJA_VERSION 4.5.13

+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 +81,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/README.md
+++ b/README.md
@@ -10,19 +10,19 @@ To make your data persistent, you have to mount `/var/www/app/public/logo` and `
 To run it:

 ```
-docker run -d
-  -e APP_ENV='production'
-  -e APP_DEBUG=0
-  -e APP_URL='http://ninja.dev'
-  -e APP_KEY='SomeRandomStringSomeRandomString'
-  -e APP_CIPHER='AES-256-CBC'
-  -e DB_TYPE='mysql'
-  -e DB_STRICT='false'
-  -e DB_HOST='localhost'
-  -e DB_DATABASE='ninja'
-  -e DB_USERNAME='ninja'
-  -e DB_PASSWORD='ninja'
-  -p '80:80'
+docker run -d \
+  -e APP_ENV='production' \
+  -e APP_DEBUG=0 \
+  -e APP_URL='http://ninja.dev' \
+  -e APP_KEY='SomeRandomStringSomeRandomString' \
+  -e APP_CIPHER='AES-256-CBC' \
+  -e DB_TYPE='mysql' \
+  -e DB_STRICT='false' \
+  -e DB_HOST='localhost' \
+  -e DB_DATABASE='ninja' \
+  -e DB_USERNAME='ninja' \
+  -e DB_PASSWORD='ninja' \
+  -p '80:80' \
  invoiceninja/invoiceninja
 ```
 A list of environment variables can be found [here](https://github.com/invoiceninja/invoiceninja/blob/master/.env.example)
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -1,6 +1,7 @@
-FROM php:7.2-fpm-alpine
+ARG PHP_IMAGE_TAG=7.2-fpm-alpine
+FROM php:${PHP_IMAGE_TAG}

-MAINTAINER Samuel Laulhau <sam@lalop.co>
+LABEL maintainer="Samuel Laulhau <sam@lalop.co>"

 #####
 # SYSTEM REQUIREMENT
@@ -10,8 +11,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/ \
-    && 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 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 +32,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.0
+ENV INVOICENINJA_VERSION 4.5.13

-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  \
+    && 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
@@ -1,41 +1,61 @@
-version: "2"
+version: '3.6'
+
+volumes:
+  db:
+  storage:
+  logo:
+  public:
+
+# uncomment if you want to use external network (example network: "web")
+#networks:
+#  web:
+#    external: true

 services:
  db:
-    image: mysql
+    image: mysql:5
    env_file: .env
    restart: always
    volumes:
-      - data-volume:/var/lib/mysql
+      - db:/var/lib/mysql
+    networks:
+      - default

  app:
    image: invoiceninja/invoiceninja
-    links:
-      - db:mysql
    env_file: .env
    restart: always
+    depends_on:
+      - db
    volumes:
-      - ./srv/invoiceninja/storage:/var/www/app/storage:rw
-      - ./srv/invoiceninja/logo:/var/www/app/public/logo:rw
+      -  storage:/var/www/app/storage
+      -  logo:/var/www/app/public/logo
+      -  public:/var/www/app/public
+    networks: 
+      - default  

  web:
-    image: nginx
+    image: nginx:1
    volumes:
      - ./nginx.conf:/etc/nginx/nginx.conf:ro
-    links:
-      - app
-    volumes_from:
-      - app
-    ports:
+      -  storage:/var/www/app/storage
+      -  logo:/var/www/app/public/logo
+      -  public:/var/www/app/public
+    expose: # Expose ports without publishing them to the host machine - they’ll only be accessible to linked services.
+      - "80"
+    ports: # Delete if you want to use reverse proxy
      - 8000:80
+    networks:
+#      - web        # uncomment if you want to use  external network (reverse proxy for example)
+      - default

  cron:
    image: invoiceninja/invoiceninja
-    links:
-      - db:mysql
    env_file: .env
-    volumes_from:
-      - app
+    volumes:
+      -  storage:/var/www/app/storage
+      -  logo:/var/www/app/public/logo
+      -  public:/var/www/app/public
    entrypoint: |
      bash -c 'bash -s <<EOF
      trap "break;exit" SIGHUP SIGINT SIGTERM
@@ -43,10 +63,8 @@ services:
      while /bin/true; do
        ./artisan ninja:send-invoices
        ./artisan ninja:send-reminders
-        sleep 1h
+        sleep 1d
      done
      EOF'
-
-volumes:
-  data-volume:
-      
+    networks:
+      - default
--- 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	03180fc65e	4.5.13	2019-05-27 10:35:50 +02:00
Stanislav Shupilkin	e0fcb50ecb	Update docker-compose.yml	2019-03-27 14:34:16 +01:00
Stanislav Shupilkin	5c418c474e	Change Dockerfile, remove deprecated MAINTAINER section, separate stage on two	2019-03-27 14:34:16 +01:00
Sam	5e59ec10e3	4.5.12	2019-03-26 09:59:53 +01:00
Sam	6b0182e712	4.5.11	2019-03-04 21:04:24 +01:00
Sam	961282a90e	4.5.10	2019-02-21 10:46:35 +01:00
Sam	3a17d81cab	4.5.9	2019-01-23 10:30:24 +01:00
Sam	a3bb9b9681	4.5.8	2019-01-08 12:40:44 +01:00
Sam	766b604971	4.5.7	2018-12-11 15:49:01 +01:00
Andreas Treubert	005e1b9dfe	Little bugfix for docker run example within readme	2018-11-14 10:21:20 +01:00
Sam	8d0a39ac71	4.5.6	2018-11-09 11:12:38 +01:00
Sam	6e12296f25	4.5.5	2018-09-28 09:45:22 +02:00
Sam	dbac9305c9	4.5.4	2018-09-10 15:41:27 +02:00
Anojh Thayaparan	3c96683d46	Cron should be run every day not every hour	2018-09-04 10:29:55 +02:00
Sam	279a282d44	4.5.3	2018-08-20 21:00:55 +02:00
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