From 4bd33353f48d191c7fb9414b762b87bffcedeb6c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 23 Jan 2020 18:54:42 +0300
Subject: [PATCH] only create app user if it doesn't exist

---
 src/app/startup.sh | 6 ++++--
 src/app/updater.sh | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/startup.sh b/src/app/startup.sh
index 2ee1780..f4eee5c 100755
--- a/src/app/startup.sh
+++ b/src/app/startup.sh
@@ -5,8 +5,10 @@ while ! pg_isready -h $DB_HOST -U $DB_USER; do
 	sleep 3
 done
 
-addgroup -g $OWNER_GID app
-adduser -D -h /var/www/html -G app -u $OWNER_UID app
+if ! id app; then
+	addgroup -g $OWNER_GID app
+	adduser -D -h /var/www/html -G app -u $OWNER_UID app
+fi
 
 DST_DIR=/var/www/html/tt-rss
 SRC_DIR=/src/tt-rss/
diff --git a/src/app/updater.sh b/src/app/updater.sh
index f81d83e..480a5d1 100755
--- a/src/app/updater.sh
+++ b/src/app/updater.sh
@@ -3,8 +3,10 @@
 # wait for the app container to delete .app_is_ready and perform rsync, etc.
 sleep 30
 
-addgroup -g $OWNER_GID app
-adduser -D -h /var/www/html -G app -u $OWNER_UID app
+if ! id app; then
+	addgroup -g $OWNER_GID app
+	adduser -D -h /var/www/html -G app -u $OWNER_UID app
+fi
 
 while ! pg_isready -h $DB_HOST -U $DB_USER; do
 	echo waiting until $DB_HOST is ready...