Merge pull request #248 from turbo124/master

Refactor DockerFiles

README.md

@@ -4,17 +4,69 @@
 
 # Docker for [Invoice Ninja](https://www.invoiceninja.com/) 
 
-:bulb: Please consider posting your question on [StackOverflow](https://stackoverflow.com/) as this widens the audience that can help you. Just use the tag `invoice-ninja` and we are there to help. This is mostly related to the usage of Invoice Ninja and the docker setup.
-If you feel your question is directly related to a code change or you want to sent in a change + PR Github is the right place, of course.
-
 :crown: **Features**
 
 :lock: Automatic HTTPS (:heart: [Caddy](https://caddyserver.com/))  
+:fire: NGINX webserver support [NGINX](https://nginx.org))
 :hammer: Fully production-ready through docker-compose  
 :pencil: Adjustable to your needs via environment variable  
 
+## Quickstart V5 Launch
+
+The dockerfile has been revamped to make is easier to get started, by default the base image selected in 5 which will pull in the latest v5 stable image.
+
+```
+git clone https://github.com/invoiceninja/dockerfiles.git
+cd dockerfiles
+```
+
+Instead of defining our environment variables inside our docker-compose.yml file we now define this in the ```env``` file, open this file up and insert your APP_URL and your APP_KEY
+
+```
+APP_URL=http://in.localhost:8003/
+APP_KEY=<insert your generated key in here>
+APP_DEBUG=true
+MULTI_DB_ENABLED=false
+DB_HOST1=db
+DB_USERNAME1=ninja
+DB_PASSWORD1=ninja
+DB_DATABASE1=ninja
+PHANTOMJS_PDF_GENERATION=false
+```
+
+The ```APP_KEY``` can be generated by running
+
+```
+docker run --rm -it invoiceninja/invoiceninja php artisan key:generate --show
+```
+
+Copy the entire string and insert in the env file at ```APP_KEY=base64....```
+
+To ensure folder permissions are correct when the container comes up for the first time it is important that you set the correct folder permissions on the ```docker``` folder.
+
+From the terminal run
+
+```sudo chown -R 1500:1500 docker/app```
+
+### Note for people running the container locally on their PC ###
+
+If you are running the container locally, then the container will need to resolve the host, to support this you will want to insert your LAN IP address and the host name in the hosts file located in ```config/hosts```
+
+For example, lets say your APP_URL is ```http://in5.test:8000``` and your LAN IP is 192.168.0.124 the hosts file will have an entry looking like this:
+
+
+```192.168.0.124 in5.test```
+
+**Please note that PDF generation using local host your domain name MUST end in .test for your PDFs to generate correctly, this is a DNS resolver issue with chromium.
+
+All that is left to do now is bring up the container
+
+
+``` docker-compose up -d```
+
+## Support
+
+If you discover a bug, please create and issue, if you query is general in nature please visit us on our [Forum ](https://forum.invoiceninja.com/)
 
-## Documentation
 
-Please see our [wiki](https://github.com/invoiceninja/dockerfiles/wiki) for further guidance.
 

config/cron.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+echo "Early Entry"
+
+cleanup ()                                                                 
+{                                                                          
+  kill -s SIGTERM $!                                                         
+  exit 0                                                                     
+}                                                                          
+                                                                           
+trap cleanup SIGINT SIGTERM                                                
+                       
+while : 
+do 
+	sleep 60 ; cd /var/www/app/ && php artisan schedule:run; 
+done

config/hosts

@@ -0,0 +1 @@
+192.168.0.124 in5.test

docker-compose.yml

@@ -4,14 +4,11 @@ services:
   server:
     image: nginx
     restart: always
-    environment: 
-      - APP_URL=http://in.localhost:8003
+    env_file: env
     volumes:
       # Vhost configuration
       #- ./config/caddy/Caddyfile:/etc/caddy/Caddyfiledocker-com
       - ./config/nginx/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf:ro
-      # Configure your mounted directories, make sure the folder 'public' and 'storage'
-      # exist, before mounting them
       # you may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
       - ./docker/app/public:/var/www/app/public:rw,delegated
       - ./docker/app/storage:/var/www/app/storage:rw,delegated
@@ -20,10 +17,12 @@ services:
     # Run webserver nginx on port 80
     # Feel free to modify depending what port is already occupied
     ports: 
-      - "8003:80"
+      - "80:80"
       #- "443:443"
     networks:
       - invoiceninja
+    extra_hosts:
+      - "in5.localhost:192.168.0.124 " #host and ip
 
   app:
     image: invoiceninja/invoiceninja:5
@@ -40,6 +39,8 @@ services:
       - db
     networks: 
       - invoiceninja  
+    extra_hosts:
+      - "in5.localhost:192.168.0.124 " #host and ip
 
   db:
     image: mysql:5
@@ -56,6 +57,8 @@ services:
       - ./docker/mysql/data:/var/lib/mysql:rw,delegated
     networks:
       - invoiceninja
+    extra_hosts:
+      - "in5.localhost:192.168.0.124 " #host and ip
 
   # THIS IS ONLY A VALID CONFIGURATION FOR IN 5. DO NOT USE FOR IN 4.
   cron:
@@ -65,16 +68,12 @@ services:
       - ./config/hosts:/etc/hosts:ro
       - ./docker/app/public:/var/www/app/public:rw,delegated
       - ./docker/app/storage:/var/www/app/storage:rw,delegated
-    entrypoint: |
-      /bin/sh -c 'sh -s <<EOF
-      trap "break;exit" SIGHUP SIGINT SIGTERM
-      while true; do
-        php artisan schedule:run;
-        sleep 60s
-      done
-      EOF'
+    command:
+    - cron.sh
     networks:
       - invoiceninja
+    extra_hosts:
+      - "in5.localhost:192.168.0.124 " #host and ip
 
   # THIS IS ONLY A VALID CONFIGURATION FOR IN 4. DO NOT USE FOR IN 5.
   # cron:

entrypoint.sh

@@ -84,6 +84,7 @@ fi
 
 # Set permission for web server to create/update files
 chown -R invoiceninja:www-data /var/www/app/storage /var/www/app/public /var/www/app/bootstrap
+chmod +x /usr/local/bin/cron.sh
 
 # Initialize values that might be stored in a file
 file_env 'APP_KEY'
@@ -104,5 +105,6 @@ file_env 'S3_SECRET'
 # Run Laravel stuff
 php artisan config:cache
 php artisan optimize
+php artisan migrate --force
 
 exec docker-php-entrypoint "$@"