From bfc56256874cc74bfd228c15f48c6e34c1e98ef8 Mon Sep 17 00:00:00 2001
From: Lee Ween Jiann <lwj5@hotmail.com>
Date: Sun, 10 Jan 2021 22:34:49 +0800
Subject: [PATCH] Update entrypoint.sh to use ENV username

---
 alpine/Dockerfile | 14 +++++++-------
 entrypoint.sh     |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index ea6f308..8b7f950 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -45,20 +45,20 @@ COPY ./config/php/php.ini /usr/local/etc/php/php.ini
 COPY ./config/php/php-cli.ini /usr/local/etc/php/php-cli.ini
 
 # Separate user
-ENV IN_USER=invoiceninja
+ENV INVOICENINJA_USER=invoiceninja
 
-RUN addgroup --gid=1500 -S "$IN_USER" && \
+RUN addgroup --gid=1500 -S "$INVOICENINJA_USER" && \
     adduser --uid=1500 \
     --disabled-password \
     --gecos "" \
     --home "$(pwd)" \
-    --ingroup "$IN_USER" \ 
+    --ingroup "$INVOICENINJA_USER" \ 
     --no-create-home \
-    "$IN_USER"; \
-    addgroup "$IN_USER" www-data; \
-    chown -R "$IN_USER":"$IN_USER" .
+    "$INVOICENINJA_USER"; \
+    addgroup "$INVOICENINJA_USER" www-data; \
+    chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" .
 
-USER $IN_USER
+USER $INVOICENINJA_USER
 
 # Download and install IN
 ENV INVOICENINJA_VERSION="${INVOICENINJA_VERSION}"
diff --git a/entrypoint.sh b/entrypoint.sh
index 3b997ca..9967f20 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -83,7 +83,7 @@ fi
 rm -rf "$BAK_PUBLIC_PATH"
 
 # Set permission for web server to create/update files
-chown -R invoiceninja:www-data /var/www/app/storage /var/www/app/public /var/www/app/bootstrap
+chown -R "$INVOICENINJA_USER":www-data /var/www/app/storage /var/www/app/public /var/www/app/bootstrap
 
 # Initialize values that might be stored in a file
 file_env 'APP_KEY'