Merge pull request #246 from turbo124/master

Fixes for crons and folder permissions

alpine/Dockerfile_v5

@@ -8,7 +8,6 @@ RUN set -eux; \
     apk add --no-cache \
     curl \
     mysql-client \
-    git \
     libarchive-tools; \
     mkdir -p /var/www/app
 
@@ -19,7 +18,6 @@ RUN curl -o /tmp/ninja.tar.gz -LJ0 https://github.com/invoiceninja/invoiceninja/
     && cp -R /var/www/app/public /var/www/app/docker-backup-public  \
     && mkdir -p /var/www/app/public/logo /var/www/app/storage \
     && cp /var/www/app/.env.example /var/www/app/.env \
-    && cp /var/www/app/.env.dusk.example /var/www/app/.env.dusk.local \
     && rm -rf /var/www/app/docs /var/www/app/tests
 
 # Install nodejs packages
@@ -43,8 +41,6 @@ COPY --from=frontend /var/www/app /var/www/app
 COPY entrypoint.sh /usr/local/bin/docker-entrypoint
 RUN chmod +x /usr/local/bin/docker-entrypoint
 
-RUN apt-get update && apt-get install -y libonig-dev
-
 RUN set -eux; \
     apk add --no-cache \
     nodejs \
@@ -55,6 +51,9 @@ RUN set -eux; \
     libjpeg-turbo-dev \
     libpng-dev \
     libzip-dev \
+    oniguruma-dev \
+    git \
+    busybox-suid \
     zip; \
     docker-php-ext-configure gd --with-freetype --with-jpeg; \
     docker-php-ext-install -j$(nproc) \
@@ -83,13 +82,6 @@ RUN apk add --no-cache \
       nodejs \
       yarn
 
-# Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
-    PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
-
-# Puppeteer v1.19.0 works with Chromium 77.
-RUN yarn add puppeteer@1.19.0
-
 ## Separate user
 ENV INVOICENINJA_USER=invoiceninja
 
@@ -104,15 +96,10 @@ RUN addgroup -S "$INVOICENINJA_USER" && \
     addgroup "$INVOICENINJA_USER" www-data; \
     chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app
 
+
 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer; 
 
-## Set up the cronjob and run cron daemon
-RUN echo "* * * * * run-parts /etc/periodic/1min" >> /etc/crontabs/root
-COPY ./config/cron/cronjob_v5.sh /etc/periodic/1min/invoiceninja_cronjob
-RUN chown $INVOICENINJA_USER /etc/periodic/1min/invoiceninja_cronjob && \
-    crond -l 2 -b
-
 USER $INVOICENINJA_USER
 
 RUN /usr/local/bin/composer install --no-dev --no-suggest --no-progress --quiet
@@ -120,8 +107,7 @@ RUN /usr/local/bin/composer install --no-dev --no-suggest --no-progress --quiet
 # Override the environment settings from projects .env file
 ENV APP_ENV production
 ENV LOG errorlog
-
+ENV SNAPPDF_EXECUTABLE_PATH /usr/bin/chromium-browser
-RUN php artisan storage:link
 
 ENTRYPOINT ["docker-entrypoint"]
 CMD ["php-fpm"]

config/nginx/in-vhost.conf

@@ -1,6 +1,6 @@
 server {
     listen 80 default_server;
-    server_name in.localhost;
+    server_name _ in.localhost;
 
     root /var/www/app/public/;
     index index.php;

docker-compose.yml

@@ -40,6 +40,9 @@ services:
       - DB_USERNAME1=ninja
       - DB_PASSWORD1=ninja
       - DB_DATABASE1=ninja
+      - PHANTOMJS_PDF_GENERATION=false
+      - SNAPPDF_EXECUTABLE_PATH="/usr/bin/chromium-browser"
+      - SNAPPDF_SKIP_DOWNLOAD=true
     volumes:
       # Configure your mounted directories, make sure the folder 'public' and 'storage'
       # exist, before mounting them
@@ -68,6 +71,24 @@ services:
     networks:
       - invoiceninja
 
+  # V5 crons only
+  cron:
+    image: invoiceninja/invoiceninja:5
+    volumes:
+      -  public:/var/www/app/public
+      -  storage:/var/www/app/storage
+    entrypoint: |
+      /bin/sh -c 'sh -s <<EOF
+      trap "break;exit" SIGHUP SIGINT SIGTERM
+      sleep 60s
+      while /bin/true; do
+        ./artisan schedule:run >> /dev/null 2>&1
+        sleep 60s
+      done
+      EOF'
+    networks:
+      - invoiceninja
+
   # THIS IS ONLY A VALID CONFIGURATION FOR IN 4. DO NOT USE FOR IN 5.
   # cron:
   #   image: invoiceninja/invoiceninja:alpine-4