change base image

hotio · Jan 23, 2024 · 8a5f0ce · 8a5f0ce
1 parent 866071b
commit 8a5f0ce
Show file tree

Hide file tree

Showing 19 changed files with 4 additions and 45 deletions.
diff --git a/VERSION.json b/VERSION.json
@@ -4,8 +4,8 @@
   "version": "2.7.6",
   "changelog": "https://github.com/caddyserver/caddy/compare/v2.7.5...v2.7.6",
   "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:8080"
 }
diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile
@@ -14,7 +14,6 @@ RUN xcaddy_version=$(curl -u "${GITHUB_ACTOR}:${GITHUB_TOKEN}" -fsSL "https://ap
 
 FROM ${UPSTREAM_IMAGE}@${UPSTREAM_DIGEST_AMD64}
 EXPOSE 8080 8443
-VOLUME ["${CONFIG_DIR}"]
 ENV CUSTOM_BUILD=""
 COPY --from=builder /caddy-bin "${APP_DIR}/caddy"
 COPY root/ /
diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile
@@ -14,7 +14,6 @@ RUN xcaddy_version=$(curl -u "${GITHUB_ACTOR}:${GITHUB_TOKEN}" -fsSL "https://ap
 
 FROM ${UPSTREAM_IMAGE}@${UPSTREAM_DIGEST_ARM64}
 EXPOSE 8080 8443
-VOLUME ["${CONFIG_DIR}"]
 ENV CUSTOM_BUILD=""
 COPY --from=builder /caddy-bin "${APP_DIR}/caddy"
 COPY root/ /
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-caddy/dependencies.d/init-setup → .../init-setup-app/dependencies.d/init-setup b/...d/service-caddy/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
@@ -7,26 +7,10 @@ echo "
 ----------------------------------------------------------------------
 ENVIRONMENT
 ----------------------------------------------------------------------
-PUID=${PUID}
-PGID=${PGID}
-UMASK=${UMASK}
-TZ=${TZ}
 CUSTOM_BUILD=${CUSTOM_BUILD}
 ----------------------------------------------------------------------
 "
 
-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
-
-echo "Applying permissions to ${CONFIG_DIR}"
-chmod "=rwx" "${CONFIG_DIR}"
-chown hotio:hotio "${CONFIG_DIR}"
-
 if [[ ! -f "${CONFIG_DIR}/Caddyfile" ]]; then
     echo "Installing default \"Caddyfile\"..."
     cp "${APP_DIR}/Caddyfile" "${CONFIG_DIR}/Caddyfile"

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-caddy/dependencies.d/init-wireguard b/...ay/s6-rc.d/init-perms/dependencies.d/base → ...rvice-caddy/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