change base image

hotio · Jan 23, 2024 · 0eb4d60 · 0eb4d60
1 parent 5a21eb9
commit 0eb4d60
Show file tree

Hide file tree

Showing 19 changed files with 6 additions and 51 deletions.
diff --git a/VERSION.json b/VERSION.json
@@ -3,8 +3,8 @@
   "version": "dd8da7f3393c9b8a7a8e8740a7f89e66515fdaab",
   "changelog": "https://github.com/stashapp/stash/compare/e7311a60d22811bb589a196c285354ba099f5058...dd8da7f3393c9b8a7a8e8740a7f89e66515fdaab",
   "upstream_image": "ghcr.io/hotio/base",
-  "upstream_tag": "alpine",
-  "upstream_digest_amd64": "sha256:aba1ad70d73a01a04940ceefcc0506c8867aa99be1e1598f7f57d79dc462ba1d",
-  "upstream_digest_arm64": "sha256:5f44dcee2c34486af761dca45b1a7b57ef953ee485050544c2255c6f21ed0278",
+  "upstream_tag": "alpinevpn",
+  "upstream_digest_amd64": "sha256:e8c549548c101b12abc2fc9399c6c6dc33e5d56603e01f6e3e23fed42d08d54a",
+  "upstream_digest_arm64": "sha256:b4fca2fdedc503aaa5f73aa1483c442d0ba03113bd359a0ab47ed75a33e5bd9b",
   "test_url": "http://localhost:9999"
 }
diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile
@@ -3,7 +3,6 @@ ARG UPSTREAM_DIGEST_AMD64
 
 FROM ${UPSTREAM_IMAGE}@${UPSTREAM_DIGEST_AMD64}
 EXPOSE 9999
-VOLUME ["${CONFIG_DIR}"]
 
 RUN apk add --no-cache ffmpeg python3 py3-requests sqlite-libs
 

diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile
@@ -3,7 +3,6 @@ ARG UPSTREAM_DIGEST_ARM64
 
 FROM ${UPSTREAM_IMAGE}@${UPSTREAM_DIGEST_ARM64}
 EXPOSE 9999
-VOLUME ["${CONFIG_DIR}"]
 
 RUN apk add --no-cache ffmpeg python3 py3-requests sqlite-libs
 

diff --git a/root/etc/s6-overlay/s6-rc.d/init-perms/up b/root/etc/s6-overlay/s6-rc.d/init-perms/up
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/run b/root/etc/s6-overlay/s6-rc.d/init-secrets/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/type b/root/etc/s6-overlay/s6-rc.d/init-secrets/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/up b/root/etc/s6-overlay/s6-rc.d/init-secrets/up
diff --git a/...d/service-stash/dependencies.d/init-setup → .../init-setup-app/dependencies.d/init-setup b/...d/service-stash/dependencies.d/init-setup → .../init-setup-app/dependencies.d/init-setup
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/run → ...etc/s6-overlay/s6-rc.d/init-setup-app/run b/root/etc/s6-overlay/s6-rc.d/init-setup/run → ...etc/s6-overlay/s6-rc.d/init-setup-app/run
@@ -5,32 +5,12 @@ umask "${UMASK}"
 
 echo "
 ----------------------------------------------------------------------
-ENVIRONMENT
+ENVIRONMENT APP
 ----------------------------------------------------------------------
-PUID=${PUID}
-PGID=${PGID}
-UMASK=${UMASK}
-TZ=${TZ}
+
 ----------------------------------------------------------------------
 "
 
-if [[ ! "${PUID}" -eq 0 ]] && [[ ! "${PGID}" -eq 0 ]]; then
-    echo "Executing usermod..."
-    mkdir "/tmp/temphome"
-    usermod -d "/tmp/temphome" hotio
-    usermod -o -u "${PUID}" hotio
-    usermod -d "${CONFIG_DIR}" hotio
-    rm -rf "/tmp/temphome"
-    groupmod -o -g "${PGID}" hotio
-else
-    echo "Running as root is not supported, please fix your PUID and PGID!"
-    exit 1
-fi
-
-echo "Applying permissions to ${CONFIG_DIR}"
-chmod "=rwx" "${CONFIG_DIR}"
-chown hotio:hotio "${CONFIG_DIR}"
-
 ln -s -f -n "${CONFIG_DIR}/" "${CONFIG_DIR}/.stash"
 chown -h hotio:hotio "${CONFIG_DIR}/.stash"
 

diff --git a/root/etc/s6-overlay/s6-rc.d/init-perms/type → ...tc/s6-overlay/s6-rc.d/init-setup-app/type b/root/etc/s6-overlay/s6-rc.d/init-perms/type → ...tc/s6-overlay/s6-rc.d/init-setup-app/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup-app/up b/root/etc/s6-overlay/s6-rc.d/init-setup-app/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-setup-app/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/dependencies.d/init-secrets b/root/etc/s6-overlay/s6-rc.d/init-setup/dependencies.d/init-secrets
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/type b/root/etc/s6-overlay/s6-rc.d/init-setup/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/up b/root/etc/s6-overlay/s6-rc.d/init-setup/up
diff --git a/...ay/s6-rc.d/init-perms/dependencies.d/base → ...rvice-stash/dependencies.d/init-wireguard b/...ay/s6-rc.d/init-perms/dependencies.d/base → ...rvice-stash/dependencies.d/init-wireguard
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-perms b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-perms
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-secrets b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-secrets
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup
diff --git a/....d/init-secrets/dependencies.d/init-perms → ...ay/s6-rc.d/user/contents.d/init-setup-app b/....d/init-secrets/dependencies.d/init-perms → ...ay/s6-rc.d/user/contents.d/init-setup-app