Merge pull request #228 from turbo124/master

Install libonig-dev with apt

alpine/Dockerfile_v5

@@ -1,4 +1,4 @@
-ARG PHP_VERSION=7.3
+ARG PHP_VERSION=7.4
 
 # Get Invoice Ninja
 FROM alpine:latest as base
@@ -7,6 +7,8 @@ ARG INVOICENINJA_VERSION
 RUN set -eux; \
     apk add --no-cache \
     curl \
+    mysql-client \
+    git \
     libarchive-tools; \
     mkdir -p /var/www/app
 
@@ -41,23 +43,26 @@ 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 \
     npm \
+    mysql-client \
     freetype-dev \
     gmp-dev \
     libjpeg-turbo-dev \
     libpng-dev \
-    libzip-dev; \
-    docker-php-ext-configure zip --with-libzip; \
-    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/; \
+    libzip-dev \
+    zip; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
     docker-php-ext-install -j$(nproc) \
         bcmath \
         exif \
         gd \
         gmp \
-        mbstring \
+#        mbstring \
         mysqli \
         opcache \
         pdo \
@@ -67,9 +72,23 @@ RUN set -eux; \
 COPY ./config/php/php.ini /usr/local/etc/php/php.ini
 COPY ./config/php/php-cli.ini /usr/local/etc/php/php-cli.ini
 
-## Set up the cronjob
-RUN echo "* * * * * run-parts /etc/periodic/1min" >> /etc/crontabs/root
-COPY ./config/cron/cronjob_v5.sh /etc/periodic/1min/invoiceninja_cronjob
+RUN apk add --no-cache \
+      chromium \
+      nss \
+      freetype \
+      freetype-dev \
+      harfbuzz \
+      ca-certificates \
+      ttf-freefont \
+      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
@@ -86,16 +105,23 @@ RUN addgroup -S "$INVOICENINJA_USER" && \
     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; \
-    composer global require hirak/prestissimo;
+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 composer install --no-dev --no-suggest --no-progress
+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
+
 ENTRYPOINT ["docker-entrypoint"]
 CMD ["php-fpm"]

docker-compose.yml

@@ -30,11 +30,16 @@ services:
   app:
     image: invoiceninja/invoiceninja:5
     restart: always
+    cap_add:
+      - SYS_ADMIN
     environment: 
       - APP_URL=https://localhost
       - APP_KEY=<INSERT THE GENERATED APPLICATION KEY HERE>
       - MULTI_DB_ENABLED=false
       - DB_HOST1=db
+      - DB_USERNAME1=ninja
+      - DB_PASSWORD1=ninja
+      - DB_DATABASE1=ninja
     volumes:
       # Configure your mounted directories, make sure the folder 'public' and 'storage'
       # exist, before mounting them
@@ -55,7 +60,7 @@ services:
       - MYSQL_ROOT_PASSWORD=ninjaAdm1nPassword
       - MYSQL_USER=ninja
       - MYSQL_PASSWORD=ninja
-      - MYSQL_DATABASE=db-ninja-01
+      - MYSQL_DATABASE=ninja
     volumes:
       - mysql-data:/var/lib/mysql:rw
       # you may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
@@ -91,4 +96,4 @@ volumes:
   # logo:
 
 networks:
-  invoiceninja:
+  invoiceninja:

entrypoint.sh

@@ -90,7 +90,11 @@ file_env 'APP_KEY'
 file_env 'API_SECRET'
 file_env 'CLOUDFLARE_API_KEY'
 file_env 'DB_USERNAME'
+file_env 'DB_USERNAME1'
+file_env 'DB_USERNAME2'
 file_env 'DB_PASSWORD'
+file_env 'DB_PASSWORD1'
+file_env 'DB_PASSWORD2'
 file_env 'MAIL_USERNAME'
 file_env 'MAIL_PASSWORD'
 file_env 'MAILGUN_SECRET'
@@ -101,7 +105,4 @@ file_env 'S3_SECRET'
 php artisan config:cache
 php artisan optimize
 
-# Start the cron daemon in background
-crond -l 2 -b
-
 exec docker-php-entrypoint "$@"