Create .keep

Fixes for docker file

alpine/Dockerfile_v5

@@ -18,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
@@ -54,6 +53,7 @@ RUN set -eux; \
     libzip-dev \
     oniguruma-dev \
     git \
+    busybox-suid \
     zip; \
     docker-php-ext-configure gd --with-freetype --with-jpeg; \
     docker-php-ext-install -j$(nproc) \
@@ -82,18 +82,11 @@ 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
 
-RUN addgroup -S "$INVOICENINJA_USER" && \
+RUN addgroup --gid=1500 -S "$INVOICENINJA_USER" && \
-    adduser \
+    adduser --uid=1500 \
     --disabled-password \
     --gecos "" \
     --home "$(pwd)" \
@@ -103,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
@@ -119,6 +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
 
 ENTRYPOINT ["docker-entrypoint"]
 CMD ["php-fpm"]

docker-compose.yml

@@ -2,53 +2,40 @@ version: '3.7'
 
 services:
   server:
-    image: caddy:alpine
+    image: nginx
     restart: always
     environment: 
-      - APP_URL=https://localhost
+      - APP_URL=http://in.localhost:8003
     volumes:
       # Vhost configuration
-      - ./config/caddy/Caddyfile:/etc/caddy/Caddyfile
+      #- ./config/caddy/Caddyfile:/etc/caddy/Caddyfiledocker-com
-
+      - ./config/nginx/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf:ro
       # Configure your mounted directories, make sure the folder 'public' and 'storage'
       # exist, before mounting them
-      -  public:/var/www/app/public
-      -  storage:/var/www/app/storage
       # you may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
-      # - ./docker/app/public:/var/www/app/public:rw,delegated
+      - ./docker/app/public:/var/www/app/public:rw,delegated
-      # - ./docker/app/storage:/var/www/app/storage:rw,delegated
+      - ./docker/app/storage:/var/www/app/storage:rw,delegated
     depends_on:
       - app
     # Run webserver nginx on port 80
     # Feel free to modify depending what port is already occupied
     ports: 
-      - "80:80"
+      - "8003:80"
-      - "443:443"
+      #- "443:443"
     networks:
       - invoiceninja
 
   app:
     image: invoiceninja/invoiceninja:5
+    env_file: env
     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
-      - PHANTOMJS_PDF_GENERATION=false
     volumes:
-      # Configure your mounted directories, make sure the folder 'public' and 'storage'
-      # exist, before mounting them
-      -  public:/var/www/app/public
-      -  storage:/var/www/app/storage
       # you may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
-      # - ./docker/app/public:/var/www/app/public:rw,delegated
+      - ./config/hosts:/etc/hosts:ro
-      # - ./docker/app/storage:/var/www/app/storage:rw,delegated
+      - ./docker/app/public:/var/www/app/public:rw,delegated
+      - ./docker/app/storage:/var/www/app/storage:rw,delegated
     depends_on:
       - db
     networks: 
@@ -56,6 +43,8 @@ services:
 
   db:
     image: mysql:5
+    ports:
+      - "3305:3306"
     restart: always
     environment: 
       - MYSQL_ROOT_PASSWORD=ninjaAdm1nPassword
@@ -63,9 +52,27 @@ services:
       - MYSQL_PASSWORD=ninja
       - 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!
-      # - ./docker/mysql/data:/var/lib/mysql:rw,delegated
+      - ./docker/mysql/data:/var/lib/mysql:rw,delegated
+    networks:
+      - invoiceninja
+
+  # 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/hosts:/etc/hosts:ro
+      - ./docker/app/public:/var/www/app/public:rw,delegated
+      - ./docker/app/storage:/var/www/app/storage:rw,delegated
+    entrypoint: |
+      /bin/sh -c 'sh -s <<EOF
+      trap "break;exit" SIGHUP SIGINT SIGTERM
+      while true; do
+        php artisan schedule:run;
+        sleep 60s
+      done
+      EOF'
     networks:
       - invoiceninja
 
@@ -88,13 +95,7 @@ services:
   #     EOF'
   #   networks:
   #     - invoiceninja
-
+  #     
-volumes:
-  mysql-data:
-  public:
-  storage:
-  # This is needed for letting th cron run correctly
-  # logo:
 
 networks:
-  invoiceninja:
+  invoiceninja:

docker/app/public/.keep

@@ -0,0 +1 @@
+

docker/app/storage/.keep

@@ -0,0 +1 @@
+

env

@@ -0,0 +1,9 @@
+APP_URL=http://in.localhost:8003/
+APP_KEY=<insert your generated key in here>
+APP_DEBUG=true
+MULTI_DB_ENABLED=false
+DB_HOST1=db
+DB_USERNAME1=ninja
+DB_PASSWORD1=ninja
+DB_DATABASE1=ninja
+PHANTOMJS_PDF_GENERATION=false