add reown_r for recursive, fix compatibility mode

feederbox826 · Nov 23, 2023 · f9f0636 · f9f0636
1 parent cca867c
commit f9f0636
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,12 +11,11 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - MIGRATE=TRUE
+    #  - MIGRATE=TRUE
     volumes:
       - E:/Workspace/stash-dev-media:/media/stash
       - E:/Workspace/stash-dev/config:/config
       - E:/Workspace/stash-dev/root:/root/.stash
-      #- E:/Workspace/stash-dev/pip:/pip-install
       - pip:/pip-install
     deploy:
       resources:

diff --git a/stash/root/opt/entrypoint.sh b/stash/root/opt/entrypoint.sh
@@ -11,13 +11,19 @@
 # setup UID/GID
 PUID=${PUID:-911}
 PGID=${PGID:-911}
-UMASK=${UMASK:-002}
 
 ###
 # FUNCTIONS
 ###
 
 reown() {
+  if [ -n "$SKIP_CHOWN" ]; then
+    return
+  fi
+  chown stash:stash "$1"
+}
+
+reown_r() {
   if [ -n "$SKIP_CHOWN" ]; then
     return
   fi
@@ -27,7 +33,7 @@ reown() {
 
 mkown() {
   mkdir -p "$1"
-  reown "$1"
+  reown_r "$1"
 }
 
 ## migration helpers
@@ -39,7 +45,7 @@ migrate_update() {
   # old path doesn't exist, create instead
   if [ -e "$OLD_PATH" ]; then
     mv -n "$OLD_PATH" "$NEW_PATH"
-    reown "$NEW_PATH"
+    reown_r "$NEW_PATH"
   else
     mkown "$NEW_PATH"
   fi
@@ -109,7 +115,7 @@ stashapp_stash_migration() {
   echo "leftover files:"
   ls -la "$CONFIG_ROOT"
   # reown files
-  reown "/config"
+  reown_r "/config"
   # symlink old directory for compatibility
   echo "symlinking $CONFIG_ROOT to /config"
   rmdir "$CONFIG_ROOT" && ln -s "/config" "$CONFIG_ROOT"
@@ -127,6 +133,8 @@ try_migrate() {
   else
     if [ -e "/root/.stash" ]; then
       echo "WARNING: /root/.stash exists, but MIGRATE is not set. This may cause issues."
+      reown "/root/"
+      reown_r "/root/.stash"
       export STASH_CONFIG_FILE="/root/.stash/config.yml"
     fi
   fi