change base image

hotio · Jan 23, 2024 · b211c96 · b211c96
1 parent 9973853
commit b211c96
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 68 deletions.
diff --git a/VERSION.json b/VERSION.json
@@ -4,7 +4,7 @@
   "version": "0.13.1",
   "changelog": "https://github.com/unpackerr/unpackerr/compare/v0.13.0...v0.13.1",
   "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"
 }
diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile
@@ -12,8 +12,6 @@ RUN apk add --no-cache git build-base bash && \
 
 FROM ${UPSTREAM_IMAGE}@${UPSTREAM_DIGEST_AMD64}
 
-VOLUME ["${CONFIG_DIR}"]
-
 COPY --from=builder /unpackerr/unpackerr.amd64.linux ${APP_DIR}/unpackerr
 COPY --from=builder /unpackerr/examples/unpackerr.conf.example ${APP_DIR}/unpackerr.conf.example
 RUN chmod 755 "${APP_DIR}/unpackerr"

diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile
@@ -12,8 +12,6 @@ RUN apk add --no-cache git build-base bash && \
 
 FROM ${UPSTREAM_IMAGE}@${UPSTREAM_DIGEST_ARM64}
 
-VOLUME ["${CONFIG_DIR}"]
-
 COPY --from=builder /unpackerr/unpackerr.arm64.linux ${APP_DIR}/unpackerr
 COPY --from=builder /unpackerr/examples/unpackerr.conf.example ${APP_DIR}/unpackerr.conf.example
 RUN chmod 755 "${APP_DIR}/unpackerr"

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/...rvice-unpackerr/dependencies.d/init-setup → .../init-setup-app/dependencies.d/init-setup b/...rvice-unpackerr/dependencies.d/init-setup → .../init-setup-app/dependencies.d/init-setup
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup-app/run b/root/etc/s6-overlay/s6-rc.d/init-setup-app/run
@@ -0,0 +1,17 @@
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+umask "${UMASK}"
+
+echo "
+----------------------------------------------------------------------
+ENVIRONMENT APP
+----------------------------------------------------------------------
+
+----------------------------------------------------------------------
+"
+
+if [[ ! -f "${CONFIG_DIR}/unpackerr.conf" ]]; then
+    cp "${APP_DIR}/unpackerr.conf.example" "${CONFIG_DIR}/unpackerr.conf"
+    chown hotio:hotio "${CONFIG_DIR}/unpackerr.conf"
+fi
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/run b/root/etc/s6-overlay/s6-rc.d/init-setup/run
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 → ...e-unpackerr/dependencies.d/init-wireguard b/...ay/s6-rc.d/init-perms/dependencies.d/base → ...e-unpackerr/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