Merge pull request #239 from beganovich/v5-transition-to-snappdf

(v5) Support for snappdf

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,8 @@ RUN set -eux; \
     libjpeg-turbo-dev \
     libpng-dev \
     libzip-dev \
+    oniguruma-dev \
+    git \
     zip; \
     docker-php-ext-configure gd --with-freetype --with-jpeg; \
     docker-php-ext-install -j$(nproc) \
@@ -83,13 +81,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
 
@@ -120,8 +111,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
-
-RUN php artisan storage:link
+ENV SNAPPDF_EXECUTABLE_PATH /usr/bin/chromium-browser
 
 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,8 @@ services:
       - DB_USERNAME1=ninja
       - DB_PASSWORD1=ninja
       - DB_DATABASE1=ninja
+      - PHANTOMJS_PDF_GENERATION=false
+      - SNAPPDF_EXECUTABLE_PATH="/usr/bin/chromium-browser"
     volumes:
       # Configure your mounted directories, make sure the folder 'public' and 'storage'
       # exist, before mounting them