Merge pull request #272 from turbo124/master

Change from queue:listen to queue:work.

alpine/Dockerfile_v5

@@ -66,7 +66,7 @@ RUN install-php-extensions \
 # Install chromium
 RUN set -eux; \
     apk add --no-cache \
-    # mysql-client \
+    mysql-client \
     git \
     chromium \
     ttf-freefont

docker-compose.yml

@@ -59,22 +59,22 @@ services:
       - "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:
-    image: invoiceninja/invoiceninja:5
-    env_file: env
-    volumes:
-      - ./config/cron.sh:/usr/local/bin/cron.sh
-      - ./config/hosts:/etc/hosts:ro
-      - ./docker/app/public:/var/www/app/public:rw,delegated
-      - ./docker/app/storage:/var/www/app/storage:rw,delegated
-    command:
-      - cron.sh
-    depends_on:
-      - app
-    networks:
-      - invoiceninja
-    extra_hosts:
-      - "in5.localhost:192.168.0.124 " #host and ip
+  # cron:
+  #   image: invoiceninja/invoiceninja:5
+  #   env_file: env
+  #   volumes:
+  #     - ./config/cron.sh:/usr/local/bin/cron.sh
+  #     - ./config/hosts:/etc/hosts:ro
+  #     - ./docker/app/public:/var/www/app/public:rw,delegated
+  #     - ./docker/app/storage:/var/www/app/storage:rw,delegated
+  #   command:
+  #     - cron.sh
+  #   depends_on:
+  #     - app
+  #   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:

examples/v5/supervisor/Dockerfile

@@ -0,0 +1,13 @@
+FROM invoiceninja/invoiceninja:5
+
+USER root
+
+RUN apk add --no-cache supervisor \
+  && mkdir /var/log/supervisord /var/run/supervisord \
+  && chown $INVOICENINJA_USER:www-data /var/log/supervisord /var/run/supervisord
+
+COPY supervisord.conf /
+
+USER $INVOICENINJA_USER
+
+CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

examples/v5/supervisor/supervisord.conf

@@ -0,0 +1,29 @@
+[supervisord]
+nodaemon=true
+user=invoiceninja
+pidfile=/var/run/supervisord/supervisord.pid
+logfile=/dev/null ; nodaemon will cause logs to go to stdout
+logfile_maxbytes=0
+loglevel=error
+
+[program:php-fpm]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=php-fpm
+
+[program:scheduler]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=php artisan schedule:work
+
+[program:queue-worker]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+numprocs=2
+command=php artisan queue:work --sleep=3 --tries=1 --memory=1024 --timeout=3600 --daemon