From 63bf902f35806b658e788ef857bb123cd1b4e51a Mon Sep 17 00:00:00 2001
From: Nick Sweeting <github@sweeting.me>
Date: Wed, 23 Oct 2024 23:28:11 -0700
Subject: [PATCH] chown TMP_DIR and LIB_DIR recursively inside
 docker_entrypoint to handle custom PUID

---
 bin/docker_entrypoint.sh | 13 ++++++++-----
 pyproject.toml           |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bin/docker_entrypoint.sh b/bin/docker_entrypoint.sh
index a7eaa96b..18114e13 100755
--- a/bin/docker_entrypoint.sh
+++ b/bin/docker_entrypoint.sh
@@ -110,12 +110,15 @@ if [[ -d "$PLAYWRIGHT_BROWSERS_PATH/.links" ]]; then
     chown -h $PUID:$PGID "$PLAYWRIGHT_BROWSERS_PATH"/.links/*
 fi
 
-# also create and chown tmp dir and lib dirs
-mkdir -p "$DATA_DIR"/lib/bin
-chown $PUID:$PGID "$DATA_DIR"/lib "$DATA_DIR"/lib/*
+# also create and chown tmp dir and lib dir (and their default equivalents inside data/)
+# mkdir -p "$DATA_DIR"/lib/bin
+# chown $PUID:$PGID "$DATA_DIR"/lib "$DATA_DIR"/lib/*
+chown $PUID:$PGID "$LIB_DIR" 2>/dev/null
 chown $PUID:$PGID "$LIB_DIR/*" 2>/dev/null &
-mkdir -p "$DATA_DIR"/tmp/workers
-chown $PUID:$PGID "$DATA_DIR"/tmp "$DATA_DIR"/tmp/*
+
+# mkdir -p "$DATA_DIR"/tmp/workers
+# chown $PUID:$PGID "$DATA_DIR"/tmp "$DATA_DIR"/tmp/*
+chown $PUID:$PGID "$TMP_DIR" 2>/dev/null
 chown $PUID:$PGID "$TMP_DIR/*" 2>/dev/null &
 
 # (this check is written in blood in 2023, QEMU silently breaks things in ways that are not obvious)
diff --git a/pyproject.toml b/pyproject.toml
index 7697cba6..c75f0641 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "archivebox"
-version = "0.8.5rc50"
+version = "0.8.5rc51"
 requires-python = ">=3.10"
 description = "Self-hosted internet archiving solution."
 authors = [{name = "Nick Sweeting", email = "pyproject.toml@archivebox.io"}]