From f03860d8ea283827b01dd53b81d8f81a9dbb726f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 5 Jan 2021 17:14:49 +1100
Subject: [PATCH] Fixes for V4 container

---
 alpine/Dockerfile          | 11 +++++------
 config/nginx/in-vhost.conf |  2 +-
 docker-compose.yml         |  6 +++---
 env                        | 11 ++++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index c43e118..daa3249 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -2,7 +2,7 @@ ARG PHP_VERSION=7.2
 
 FROM php:${PHP_VERSION}-fpm-alpine
 
-LABEL maintainer="Samuel Laulhau <sam@lalop.co>, Holger Lösken <holger.loesken@codedge.de>"
+LABEL maintainer="David Bomba <turbo124@gmail.com>"
 
 #####
 # SYSTEM REQUIREMENT
@@ -24,8 +24,8 @@ RUN set -eux; \
     libzip-dev
 
 RUN docker-php-ext-configure gd --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include --with-webp-dir=/usr/include --with-freetype-dir=/usr/include/; \
-	docker-php-ext-configure zip --with-libzip; \
-	docker-php-ext-install -j$(nproc) \
+  docker-php-ext-configure zip --with-libzip; \
+  docker-php-ext-install -j$(nproc) \
        iconv \
        gd \
        gmp \
@@ -41,8 +41,8 @@ COPY ./config/php/php-cli.ini /usr/local/etc/php/php-cli.ini
 # Separate user
 ENV IN_USER=invoiceninja
 
-RUN addgroup -S "$IN_USER" && \
-    adduser \
+RUN addgroup --gid=1500 -S "$IN_USER" && \
+    adduser --uid=1500 \
     --disabled-password \
     --gecos "" \
     --home "$(pwd)" \
@@ -63,7 +63,6 @@ RUN curl -s -o /tmp/ninja.zip -SL https://download.invoiceninja.com/ninja-v${INV
     && mv /var/www/app/storage /var/www/app/docker-backup-storage  \
     && mv /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 \
     && chmod -R 755 /var/www/app/storage  \
     && rm -rf /var/www/app/docs /var/www/app/tests
 
diff --git a/config/nginx/in-vhost.conf b/config/nginx/in-vhost.conf
index 180355e..8fde353 100644
--- a/config/nginx/in-vhost.conf
+++ b/config/nginx/in-vhost.conf
@@ -1,6 +1,6 @@
 server {
     listen 80 default_server;
-    server_name _ in.localhost;
+    server_name _;
 
     root /var/www/app/public/;
     index index.php;
diff --git a/docker-compose.yml b/docker-compose.yml
index c9b2aff..b6fef49 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -79,9 +79,9 @@ services:
   # cron:
   #   image: invoiceninja/invoiceninja:alpine-4
   #   volumes:
-  #     -  storage:/var/www/app/storage
-  #     -  logo:/var/www/app/public/logo
-  #     -  public:/var/www/app/public
+      # - ./docker/app/public:/var/www/app/public:rw,delegated
+      # - ./docker/app/storage:/var/www/app/storage:rw,delegated
+      # - ./docker/app/public/logo:/var/www/app/public/logo:rw,delegated
   #   entrypoint: |
   #     /bin/sh -c 'sh -s <<EOF
   #     trap "break;exit" SIGHUP SIGINT SIGTERM
diff --git a/env b/env
index 64c32ef..965a97d 100644
--- a/env
+++ b/env
@@ -9,8 +9,9 @@ DB_DATABASE1=ninja
 PHANTOMJS_PDF_GENERATION=false
 
 #V4 env vars
-DB_STRICT='false'
-DB_HOST='db'
-DB_DATABASE='ninja'
-DB_USERNAME='ninja'
-DB_PASSWORD='ninja'
\ No newline at end of file
+DB_STRICT=false
+DB_HOST=db
+DB_DATABASE=ninja
+DB_USERNAME=ninja
+DB_PASSWORD=ninja
+APP_CIPHER=AES-256-CBC
\ No newline at end of file