Merge pull request #228 from turbo124/master

Install libonig-dev with apt

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at contact@invoiceninja.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

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; \
+    libzip-dev \
-    docker-php-ext-configure zip --with-libzip; \
+    zip; \
-    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/; \
+    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,6 +72,24 @@ 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
 
+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
 
@@ -82,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; \
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer; 
-    composer global require hirak/prestissimo;
+
+## 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"]

config/cron/cronjob_v5.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+cd /var/www/app; php artisan schedule:run >> /dev/null 2>&1

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!
@@ -63,15 +68,15 @@ services:
     networks:
       - invoiceninja
 
- 
+  # THIS IS ONLY A VALID CONFIGURATION FOR IN 4. DO NOT USE FOR IN 5.
   # cron:
-  #   image: invoiceninja/invoiceninja
+  #   image: invoiceninja/invoiceninja:alpine-4
   #   volumes:
   #     -  storage:/var/www/app/storage
   #     -  logo:/var/www/app/public/logo
   #     -  public:/var/www/app/public
   #   entrypoint: |
-  #     bash -c 'bash -s <<EOF
+  #     /bin/sh -c 'sh -s <<EOF
   #     trap "break;exit" SIGHUP SIGINT SIGTERM
   #     sleep 300s
   #     while /bin/true; do
@@ -87,6 +92,8 @@ volumes:
   mysql-data:
   public:
   storage:
+  # This is needed for letting th cron run correctly
+  # logo:
 
 networks:
-  invoiceninja:
+  invoiceninja:

entrypoint.sh

@@ -41,6 +41,7 @@ file_env() {
         unset "$fileVar"
 }
 
+
 # first arg is `-f` or `--some-option`
 if [ "${1#-}" != "$1" ]; then
 	set -- php-fpm "$@"
@@ -89,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'