diff --git a/.env.scripts b/.env.scripts index dcc3a4d..0f4861a 100644 --- a/.env.scripts +++ b/.env.scripts @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202509161146-git +##@Version : 202605131434-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT -# @@Copyright : Copyright 2025 CasjaysDev -# @@Created : Tue Sep 16 11:46:15 AM EDT 2025 +# @@Copyright : Copyright 2026 CasjaysDev +# @@Created : Wed May 13 02:34:14 PM EDT 2026 # @@File : .env.scripts # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript diff --git a/AI.md b/AI.md new file mode 100644 index 0000000..cc08fb8 --- /dev/null +++ b/AI.md @@ -0,0 +1,100 @@ +# AI context — apprise + +## Build flow + +1. `FROM casjaysdev/alpine:latest` (build stage) with gosu sidecar. +2. `COPY ./rootfs/. /` — ships all configs, scripts, and pre-bundled source tarball early. +3. `pkmgr install bash` → switch to `/bin/bash` shell. +4. Run `00-init.sh` (sanity setup, usually a no-op stub). +5. Run `01-system.sh` (timezone, system-level tweaks). +6. `pkmgr install $PACK_LIST` — installs nginx, python3, gunicorn, gevent, Django and all Alpine-packaged Python deps. +7. Run `02-packages.sh` (stub). +8. Run `03-files.sh` — auto-installs `rootfs/tmp/etc/nginx/` → `/etc/nginx/`, stages copies under `template-files/config/`. +9. Run `04-users.sh` — creates `apprise` system user/group via `addgroup -S / adduser -S`. +10. Run `05-custom.sh` — the critical build step: + - Wipes `/etc/nginx/*` and replaces with our optimized config (preserving `mime.types`). + - Unpacks the pre-bundled `apprise-api` source tarball from `/tmp/apprise-src/` into `/usr/local/share/apprise-api/`. + - Patches `gunicorn.conf.py` to use `/run/apprise/gunicorn.sock` instead of upstream's `/tmp/` path. + - `pip install apprise PGPy slixmpp smpplib gntp` (deps Alpine does not package). + - Creates runtime directories and drops `apprise.yml.sample` into the template-files config seed. +11. Run `06-post.sh` (stub — late permission/symlink tweaks). +12. Run `07-cleanup.sh` (stub — per-service cache cleanup). +13. Generic cleanup (`pkmgr clean`, `rm -Rf /usr/share/doc/* /var/tmp/* ...`). +14. `FROM scratch` final stage: `COPY --from=build /. /`; sets ENVs, LABELs, VOLUME, EXPOSE, ENTRYPOINT/HEALTHCHECK. + +## Services wired + +| Component | Binary/path | Role | +|-------------|----------------------------------------------------------|-------------------------------| +| tini | `/usr/bin/tini` | PID 1 / reaper | +| entrypoint | `/usr/local/bin/entrypoint.sh` | Framework orchestrator | +| init.d | `/usr/local/etc/docker/init.d/99-apprise.sh` | Service configuration + launch| +| start-apprise | `/usr/local/etc/docker/bin/start-apprise` | Wrapper: gunicorn bg + nginx fg| +| gunicorn | `/usr/bin/gunicorn` (via `py3-gunicorn`) | WSGI server (gevent workers) | +| nginx | `/usr/sbin/nginx` | HTTP reverse proxy (port 8000)| + +## init.d behavior (`99-apprise.sh`) + +The script is sourced by `entrypoint.sh` via `__start_init_scripts`. It: + +1. Checks `APPRISE_ENABLED` — exits silently if set to `no`. +2. Checks for the `/run/.start_init_scripts.pid` sentinel (prevents double-run on healthcheck invocations). +3. Cleans up stale PID files from prior crashes. +4. Calls framework hooks in order: + - `__run_precopy` → `__execute_prerun` (creates runtime dirs `/run/apprise`, `/tmp/apprise`, `/data/logs/apprise`, `/config/apprise/{store,attach,plugin,conf.d}`) + - `__initialize_system_etc` (seeds `/config/nginx/` from template-files on first run) + - `__run_pre_execute_checks` (runs `nginx -t` to validate the config before starting) + - `__update_conf_files` (token replacement: `REPLACE_TZ` → `${TZ:-UTC}` in nginx.conf) + - `__pre_execute` (final last-mile actions) + - `__run_start_script` (checks that nginx is not already running, then calls `start-apprise`) + - `__post_execute` (background: copies `apprise.yml.sample` into `/config/apprise/` on first run) + +## Config paths + +| Path | Purpose | +|----------------------------------|-------------------------------------------------------| +| `/etc/nginx/nginx.conf` | Active nginx config (wipe-and-replace from our copy) | +| `/config/nginx/` | User-editable nginx config (seeded on first run) | +| `/config/apprise/store/` | Apprise persistent config profiles (`.yml`) | +| `/config/apprise/attach/` | Attachment staging area | +| `/config/apprise/plugin/` | Custom Apprise plugins | +| `/config/apprise/conf.d/` | Optional nginx location overrides (included optionally)| +| `/data/logs/apprise/` | nginx access/error logs + gunicorn log | +| `/run/apprise/gunicorn.sock` | Unix socket between nginx and gunicorn | +| `/usr/local/share/apprise-api/webapp/` | Django app root (manage.py, core/, api/, gunicorn.conf.py) | + +## Environment variables (runtime) + +| Variable | Default | Used by | +|------------------------|-------------------------------|--------------------------| +| `APPRISE_ENABLED` | `yes` | 99-apprise.sh | +| `APPRISE_CONFIG_DIR` | `/config/apprise/store` | gunicorn / Django | +| `APPRISE_ATTACH_DIR` | `/config/apprise/attach` | gunicorn / Django | +| `APPRISE_PLUGIN_PATHS` | `/config/apprise/plugin` | gunicorn / Django | +| `TZ` | `America/New_York` | nginx, Python logging | + +## start-apprise wrapper + +`/usr/local/etc/docker/bin/start-apprise`: +1. Creates `/run/apprise`, `/tmp/apprise`, log dirs. +2. Exports `APPRISE_*` env defaults if not already set. +3. Starts gunicorn in background: `cd /usr/local/share/apprise-api/webapp && gunicorn -c gunicorn.conf.py --worker-tmp-dir /dev/shm core.wsgi >> /data/logs/apprise/gunicorn.log 2>&1 &` +4. Polls (up to 15s) for `/run/apprise/gunicorn.sock` to appear. +5. `exec /usr/sbin/nginx -c /etc/nginx/nginx.conf` — nginx runs in the foreground with `daemon off;`. + +## File layout key + +``` +rootfs/ + usr/local/bin/entrypoint.sh # SHARED: framework orchestrator (CONTAINER_NAME="apprise") + usr/local/bin/pkmgr # SHARED: apk/apt/dnf wrapper + usr/local/etc/docker/ + functions/entrypoint.sh # SHARED: framework function library + init.d/99-apprise.sh # PER-REPO: service init + launch + bin/start-apprise # PER-REPO: gunicorn+nginx launch wrapper + tmp/etc/nginx/nginx.conf # PER-REPO: optimized nginx config + tmp/etc/nginx/mime.types # PER-REPO: mime types (preserved from Alpine pkg) + root/docker/setup/ + 04-users.sh # PER-REPO: creates apprise system user + 05-custom.sh # PER-REPO: wipe-replace configs + pip install +``` diff --git a/Dockerfile b/Dockerfile index ca7d3d3..59afb5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Docker image for apprise using the alpine template ARG IMAGE_NAME="apprise" ARG PHP_SERVER="apprise" -ARG BUILD_DATE="202605091200" +ARG BUILD_DATE="202605131434" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/local/share/apprise-api/webapp" @@ -76,13 +76,7 @@ RUN set -e; \ RUN set -e; \ echo "Setting up prerequisites"; \ - apk --no-cache add bash; \ - SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ - BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ - [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \ - [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true + true ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] @@ -97,12 +91,7 @@ RUN echo "Initializing the system"; \ RUN echo "Creating and editing system files "; \ $SHELL_OPTS; \ - rm -Rf "/etc/apk/repositories"; \ - [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \ - echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \ - echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \ - if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \ - apk update; apk upgrade --no-cache; \ + [ -f "/root/.profile" ] || touch "/root/.profile"; \ if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \ echo "" @@ -267,4 +256,3 @@ STOPSIGNAL SIGRTMIN+3 ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ] HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ] - diff --git a/IDEA.md b/IDEA.md new file mode 100644 index 0000000..fc9421e --- /dev/null +++ b/IDEA.md @@ -0,0 +1,3 @@ +# Idea + +This image provides a self-hosted REST notification gateway built on top of the upstream `caronc/apprise-api` Django web application. It bundles **nginx + gunicorn + Django + the apprise notification library** into a single Alpine-based container so users can send push notifications to 80+ services (Slack, Discord, Telegram, Pushover, email, MQTT, and more) by POSTing to a simple HTTP endpoint. Persistent stateful configuration profiles (named bundles of notification URLs) live under `/config/apprise/store/` and survive container restarts, while nginx proxies all traffic on port 8000 to gunicorn over a Unix socket. diff --git a/TODO.AI.md b/TODO.AI.md new file mode 100644 index 0000000..92d9875 --- /dev/null +++ b/TODO.AI.md @@ -0,0 +1,24 @@ +# TODO — apprise + +## Done + +- [x] Dockerfile: BUILD_DATE=202605131434, prerequisites RUN=`true`, removed inline APK repos block, added `.profile` touch +- [x] .env.scripts: 2026 header, all ENV_ fields verified correct +- [x] entrypoint.sh: header updated (version + date), CONTAINER_NAME="apprise" confirmed +- [x] pkmgr: verified identical to template — no change needed +- [x] functions/entrypoint.sh: replaced with 2026 version from example (1724 lines) +- [x] 99-apprise.sh: full canonical rewrite — trap handler, script_exit, all 8 hook functions, framework call sequence, apprise-specific env/dirs +- [x] Setup scripts 00,01,02,03,06,07: updated to current example stubs +- [x] Setup scripts 04-users.sh, 05-custom.sh: preserved (service-specific logic) +- [x] `bash -n` syntax checks: all shell scripts pass +- [x] IDEA.md: created +- [x] AI.md: created +- [x] TODO.AI.md: this file + +## Pending + +- [ ] Build verification: `buildx run Dockerfile` for linux/amd64 + linux/arm64 +- [ ] Smoke test: `docker run -d -p 18000:8000 casjaysdevdocker/apprise:latest` + - [ ] `curl http://localhost:18000/` returns 200 + - [ ] `curl -X POST http://localhost:18000/notify -d 'urls=json://&body=test&title=test'` returns expected response + - [ ] `/config/apprise/store`, `/config/nginx/`, `/usr/local/share/apprise-api/webapp/manage.py` all exist in container diff --git a/rootfs/root/docker/setup/00-init.sh b/rootfs/root/docker/setup/00-init.sh index 5a34be8..99e88df 100755 --- a/rootfs/root/docker/setup/00-init.sh +++ b/rootfs/root/docker/setup/00-init.sh @@ -1,40 +1,45 @@ #!/usr/bin/env bash -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202509161144-git +# shellcheck shell=bash +# - - - - - - - - - - - - - - - - - - - - - - - - - +##@Version : 202605131431-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT -# @@ReadME : -# @@Copyright : Copyright 2023 CasjaysDev -# @@Created : Mon Aug 28 06:48:42 PM EDT 2023 +# @@Copyright : Copyright 2026 CasjaysDev +# @@Created : Wed May 13 02:31:25 PM EDT 2026 # @@File : 00-init.sh # @@Description : script to run init -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# shellcheck shell=bash -# shellcheck disable=SC2016 -# shellcheck disable=SC2031 -# shellcheck disable=SC2120 -# shellcheck disable=SC2155 -# shellcheck disable=SC2199 -# shellcheck disable=SC2317 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# @@Changelog : newScript +# @@TODO : Refactor code +# @@Other : N/A +# @@Resource : N/A +# @@Terminal App : yes +# @@sudo/root : yes +# @@Template : templates/dockerfiles/init_scripts/00-init.sh +# - - - - - - - - - - - - - - - - - - - - - - - - - +# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options set -o pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables exitCode=0 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Predefined actions if [ -d "/usr/local/share/template-files/data" ]; then rm -Rf "/usr/local/share/template-files/data"/*; fi if [ -d "/usr/local/share/template-files/config" ]; then rm -Rf "/usr/local/share/template-files/config"/*; fi if [ -d "/usr/local/share/template-files/defaults" ]; then rm -Rf "/usr/local/share/template-files/defaults"/*; fi -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Main script -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set the exit code #exitCode=$? -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - exit $exitCode +# - - - - - - - - - - - - - - - - - - - - - - - - - +# ex: ts=2 sw=2 et filetype=sh +# - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/rootfs/root/docker/setup/01-system.sh b/rootfs/root/docker/setup/01-system.sh index bb334c2..c7cae6f 100755 --- a/rootfs/root/docker/setup/01-system.sh +++ b/rootfs/root/docker/setup/01-system.sh @@ -1,38 +1,43 @@ #!/usr/bin/env bash -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202509161144-git +# shellcheck shell=bash +# - - - - - - - - - - - - - - - - - - - - - - - - - +##@Version : 202605131431-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT -# @@ReadME : -# @@Copyright : Copyright 2023 CasjaysDev -# @@Created : Mon Aug 28 06:48:42 PM EDT 2023 +# @@Copyright : Copyright 2026 CasjaysDev +# @@Created : Wed May 13 02:31:25 PM EDT 2026 # @@File : 01-system.sh # @@Description : script to run system -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# shellcheck shell=bash -# shellcheck disable=SC2016 -# shellcheck disable=SC2031 -# shellcheck disable=SC2120 -# shellcheck disable=SC2155 -# shellcheck disable=SC2199 -# shellcheck disable=SC2317 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# @@Changelog : newScript +# @@TODO : Refactor code +# @@Other : N/A +# @@Resource : N/A +# @@Terminal App : yes +# @@sudo/root : yes +# @@Template : templates/dockerfiles/init_scripts/01-system.sh +# - - - - - - - - - - - - - - - - - - - - - - - - - +# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options set -o pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables exitCode=0 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Predefined actions -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Main script -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set the exit code #exitCode=$? -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - exit $exitCode +# - - - - - - - - - - - - - - - - - - - - - - - - - +# ex: ts=2 sw=2 et filetype=sh +# - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/rootfs/root/docker/setup/02-packages.sh b/rootfs/root/docker/setup/02-packages.sh index 0d51edc..58c3443 100755 --- a/rootfs/root/docker/setup/02-packages.sh +++ b/rootfs/root/docker/setup/02-packages.sh @@ -1,38 +1,43 @@ #!/usr/bin/env bash -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202509161144-git +# shellcheck shell=bash +# - - - - - - - - - - - - - - - - - - - - - - - - - +##@Version : 202605131431-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT -# @@ReadME : -# @@Copyright : Copyright 2023 CasjaysDev -# @@Created : Mon Aug 28 06:48:42 PM EDT 2023 +# @@Copyright : Copyright 2026 CasjaysDev +# @@Created : Wed May 13 02:31:25 PM EDT 2026 # @@File : 02-packages.sh # @@Description : script to run packages -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# shellcheck shell=bash -# shellcheck disable=SC2016 -# shellcheck disable=SC2031 -# shellcheck disable=SC2120 -# shellcheck disable=SC2155 -# shellcheck disable=SC2199 -# shellcheck disable=SC2317 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# @@Changelog : newScript +# @@TODO : Refactor code +# @@Other : N/A +# @@Resource : N/A +# @@Terminal App : yes +# @@sudo/root : yes +# @@Template : templates/dockerfiles/init_scripts/02-packages.sh +# - - - - - - - - - - - - - - - - - - - - - - - - - +# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options set -o pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables exitCode=0 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Predefined actions -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Main script -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set the exit code #exitCode=$? -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - exit $exitCode +# - - - - - - - - - - - - - - - - - - - - - - - - - +# ex: ts=2 sw=2 et filetype=sh +# - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/rootfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh index ed8bb0e..5823f67 100755 --- a/rootfs/root/docker/setup/03-files.sh +++ b/rootfs/root/docker/setup/03-files.sh @@ -1,31 +1,32 @@ #!/usr/bin/env bash -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202408270903-git +# shellcheck shell=bash +# - - - - - - - - - - - - - - - - - - - - - - - - - +##@Version : 202605131431-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT -# @@ReadME : -# @@Copyright : Copyright 2023 CasjaysDev -# @@Created : Mon Aug 28 06:48:42 PM EDT 2023 +# @@Copyright : Copyright 2026 CasjaysDev +# @@Created : Wed May 13 02:31:25 PM EDT 2026 # @@File : 03-files.sh # @@Description : script to run files -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# shellcheck shell=bash -# shellcheck disable=SC2016 -# shellcheck disable=SC2031 -# shellcheck disable=SC2120 -# shellcheck disable=SC2155 -# shellcheck disable=SC2199 -# shellcheck disable=SC2317 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# @@Changelog : newScript +# @@TODO : Refactor code +# @@Other : N/A +# @@Resource : N/A +# @@Terminal App : yes +# @@sudo/root : yes +# @@Template : templates/dockerfiles/init_scripts/03-files.sh +# - - - - - - - - - - - - - - - - - - - - - - - - - +# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options set -o pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables exitCode=0 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Predefined actions if [ -d "/tmp/bin" ]; then mkdir -p "/usr/local/bin" @@ -79,11 +80,15 @@ if [ -d "/tmp/data" ]; then done fi unset data -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Main script -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set the exit code #exitCode=$? -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - exit $exitCode +# - - - - - - - - - - - - - - - - - - - - - - - - - +# ex: ts=2 sw=2 et filetype=sh +# - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/rootfs/root/docker/setup/06-post.sh b/rootfs/root/docker/setup/06-post.sh index e9f2ec7..a0c32c6 100755 --- a/rootfs/root/docker/setup/06-post.sh +++ b/rootfs/root/docker/setup/06-post.sh @@ -1,38 +1,43 @@ #!/usr/bin/env bash -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202509161144-git +# shellcheck shell=bash +# - - - - - - - - - - - - - - - - - - - - - - - - - +##@Version : 202605131431-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT -# @@ReadME : -# @@Copyright : Copyright 2023 CasjaysDev -# @@Created : Mon Aug 28 06:48:42 PM EDT 2023 +# @@Copyright : Copyright 2026 CasjaysDev +# @@Created : Wed May 13 02:31:26 PM EDT 2026 # @@File : 06-post.sh # @@Description : script to run post -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# shellcheck shell=bash -# shellcheck disable=SC2016 -# shellcheck disable=SC2031 -# shellcheck disable=SC2120 -# shellcheck disable=SC2155 -# shellcheck disable=SC2199 -# shellcheck disable=SC2317 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# @@Changelog : newScript +# @@TODO : Refactor code +# @@Other : N/A +# @@Resource : N/A +# @@Terminal App : yes +# @@sudo/root : yes +# @@Template : templates/dockerfiles/init_scripts/06-post.sh +# - - - - - - - - - - - - - - - - - - - - - - - - - +# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options set -o pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables exitCode=0 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Predefined actions -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Main script -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set the exit code #exitCode=$? -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - exit $exitCode +# - - - - - - - - - - - - - - - - - - - - - - - - - +# ex: ts=2 sw=2 et filetype=sh +# - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/rootfs/root/docker/setup/07-cleanup.sh b/rootfs/root/docker/setup/07-cleanup.sh index dd8e45e..23b9272 100755 --- a/rootfs/root/docker/setup/07-cleanup.sh +++ b/rootfs/root/docker/setup/07-cleanup.sh @@ -1,39 +1,47 @@ #!/usr/bin/env bash -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202509161144-git +# shellcheck shell=bash +# - - - - - - - - - - - - - - - - - - - - - - - - - +##@Version : 202605131431-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : MIT -# @@ReadME : -# @@Copyright : Copyright 2023 CasjaysDev -# @@Created : Mon Aug 28 06:48:42 PM EDT 2023 +# @@Copyright : Copyright 2026 CasjaysDev +# @@Created : Wed May 13 02:31:26 PM EDT 2026 # @@File : 07-cleanup.sh # @@Description : script to run cleanup -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# shellcheck shell=bash -# shellcheck disable=SC2016 -# shellcheck disable=SC2031 -# shellcheck disable=SC2120 -# shellcheck disable=SC2155 -# shellcheck disable=SC2199 -# shellcheck disable=SC2317 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# @@Changelog : newScript +# @@TODO : Refactor code +# @@Other : N/A +# @@Resource : N/A +# @@Terminal App : yes +# @@sudo/root : yes +# @@Template : templates/dockerfiles/init_scripts/07-cleanup.sh +# - - - - - - - - - - - - - - - - - - - - - - - - - +# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options set -o pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Load functions +__find_and_remove() { [ -z "$1" ] || find "${2:-/etc}" -iname "$1" -exec rm -Rf {} \; 2>/dev/null; } +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables exitCode=0 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Predefined actions if [ -d "/tmp" ]; then rm -Rf "/tmp"/*; fi if [ -d "$HOME/.cache" ]; then rm -Rf "$HOME/.cache"; fi -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Main script -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - # Set the exit code #exitCode=$? -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - exit $exitCode +# - - - - - - - - - - - - - - - - - - - - - - - - - +# ex: ts=2 sw=2 et filetype=sh +# - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh index b46dbdf..b61c054 100755 --- a/rootfs/usr/local/bin/entrypoint.sh +++ b/rootfs/usr/local/bin/entrypoint.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202602061352-git +##@Version : 202605052024-git # @@Author : Jason Hempstead # @@Contact : jason@casjaysdev.pro # @@License : WTFPL # @@ReadME : entrypoint.sh --help # @@Copyright : Copyright: (c) 2026 Jason Hempstead, Casjays Developments -# @@Created : Tuesday, May 05, 2026 14:38 EDT +# @@Created : Wednesday, May 13, 2026 14:31 EDT # @@File : entrypoint.sh # @@Description : Entrypoint file for apprise # @@Changelog : New script diff --git a/rootfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh index 9b8c550..e5c74eb 100644 --- a/rootfs/usr/local/etc/docker/functions/entrypoint.sh +++ b/rootfs/usr/local/etc/docker/functions/entrypoint.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202511301145-git +##@Version : 202605051922-git # @@Author : Jason Hempstead # @@Contact : git-admin@casjaysdev.pro # @@License : LICENSE.md @@ -31,7 +31,20 @@ else set -o pipefail fi # - - - - - - - - - - - - - - - - - - - - - - - - - -__remove_extra_spaces() { sed 's/\( \)*/\1/g;s|^ ||g'; } +__remove_extra_spaces() { sed -E 's/ +/ /g; s|^ ||'; } +# - - - - - - - - - - - - - - - - - - - - - - - - - +__log_debug() { + [ "$DEBUGGER" = "on" ] && echo "[DEBUG] $*" >&2 +} +__log_info() { + echo "[INFO] $*" +} +__log_warn() { + echo "[WARN] $*" >&2 +} +__log_error() { + echo "[ERROR] $*" >&2 +} # - - - - - - - - - - - - - - - - - - - - - - - - - __printf_space() { local pad=$(printf '%0.1s' " "{1..60}) @@ -47,185 +60,137 @@ __printf_space() { # - - - - - - - - - - - - - - - - - - - - - - - - - __mkdir() { if [ -n "$1" ]; then - mkdir -p "$@" 2>/dev/null || true + if ! mkdir -p "$@" 2>/dev/null; then + [ "$DEBUGGER" = "on" ] && echo "Warning: Failed to create directory: $*" >&2 + return 1 + fi fi + return 0 } __rm() { if [ -n "$1" ] && [ -e "$1" ]; then - rm -Rf "${1:?}" 2>/dev/null || true - fi -} -__grep_test() { - if grep -sh "$1" "$2" 2>/dev/null | grep -qwF "${3:-$1}"; then - return 0 - else - return 1 - fi -} -__netstat() { - if [ -f "$(type -P netstat 2>/dev/null)" ]; then - netstat "$@" 2>/dev/null - else - return 10 - fi -} -__cd() { - if [ ! -d "$1" ]; then - mkdir -p "$1" 2>/dev/null || return 1 - fi - builtin cd "$1" || return 1 -} -__is_in_file() { - if [ -e "$2" ] && grep -Rsq "$1" "$2" 2>/dev/null; then - return 0 - else - return 1 - fi -} -__curl() { - if curl -q -sfI --max-time 3 -k -o /dev/null "$@" 2>/dev/null; then - return 0 - else - return 10 - fi -} -__find() { - if find "$1" -mindepth 1 -type ${2:-f,d} 2>/dev/null | grep '.'; then - return 0 - else - return 10 - fi -} -__pcheck() { - if [ -n "$(which pgrep 2>/dev/null)" ] && pgrep -x "$1" &>/dev/null; then - return 0 - else - return 10 - fi -} -__file_exists_with_content() { - if [ -n "$1" ] && [ -f "$1" ] && [ -s "$1" ]; then - return 0 - else - return 2 - fi -} -__sed() { - if sed -i 's|'$1'|'$2'|g' "$3" 2>/dev/null; then - return 0 - elif sed -i "s|$1|$2|g" "$3" 2>/dev/null; then - return 0 - else - return 0 - fi -} -__ps() { - if [ -f "$(type -P ps 2>/dev/null)" ]; then - if ps "$@" 2>/dev/null | sed 's|:||g' | grep -Fw " ${1:-$SERVICE_NAME}$"; then - return 0 - else - return 10 - fi - else - return 10 - fi -} -__is_dir_empty() { - if [ -n "$1" ]; then - if [ "$(ls -A "$1" 2>/dev/null | wc -l)" -eq 0 ]; then - return 0 - else + if ! rm -Rf "${1:?}" 2>/dev/null; then + [ "$DEBUGGER" = "on" ] && echo "Warning: Failed to remove: $1" >&2 return 1 fi - else - return 1 fi + return 0 +} +__grep_test() { grep -sh "$1" "$2" 2>/dev/null | grep -qwF "${3:-$1}"; } +__netstat() { + command -v netstat &>/dev/null || { + [ "$DEBUGGER" = "on" ] && echo "Warning: netstat command not found" >&2 + return 10 + } + netstat "$@" 2>/dev/null +} +__cd() { + [ -d "$1" ] || mkdir -p "$1" 2>/dev/null || return 1 + builtin cd "$1" || return 1 +} +__is_in_file() { [ -e "$2" ] && grep -Rsq "$1" "$2" 2>/dev/null; } +__curl() { curl -q -sfI --max-time 3 -k -o /dev/null "$@" 2>/dev/null || return 10; } +__find() { + local result + result=$(find "$1" -mindepth 1 -type "${2:-f,d}" 2>/dev/null) + [ -n "$result" ] || return 10 + printf '%s\n' "$result" +} +__pcheck() { + command -v pgrep &>/dev/null && pgrep -x "$1" &>/dev/null || return 10 +} +__file_exists_with_content() { [ -n "$1" ] && [ -f "$1" ] && [ -s "$1" ] || return 2; } +__sed() { sed -i "s|$1|$2|g" "$3" 2>/dev/null || return 1; } +__ps() { + command -v ps &>/dev/null || return 10 + ps "$@" 2>/dev/null | sed 's|:||g' | grep -Fw " ${1:-$SERVICE_NAME}$" || return 10 +} +__is_dir_empty() { + [ -n "$1" ] && [ -d "$1" ] || return 1 + [ -z "$(ls -A "$1" 2>/dev/null)" ] } __get_ip6() { - local ip6 - ip6="$(ip a 2>/dev/null | grep -w 'inet6' | awk '{print $2}' | grep -vE '^::1|^fe' | sed 's|/.*||g' | head -n1 | grep '.')" - if [ -n "$ip6" ]; then - echo "$ip6" - else - echo '' - fi + ip a 2>/dev/null | awk '/^[[:space:]]*inet6 / { + split($2, a, "/"); ip = a[1] + if (ip !~ /^::1$/ && ip !~ /^fe/) { print ip; exit } + }' } __get_ip4() { local ip4 - ip4="$(ip a 2>/dev/null | grep -w 'inet' | awk '{print $2}' | grep -vE '^127.0.0' | sed 's|/.*||g' | head -n1 | grep '.')" - if [ -n "$ip4" ]; then - echo "$ip4" - else - echo '127.0.0.1' - fi + ip4=$(ip a 2>/dev/null | awk '/^[[:space:]]*inet / { + split($2, a, "/"); ip = a[1] + if (ip !~ /^127\.0\.0/) { print ip; exit } + }') + echo "${ip4:-127.0.0.1}" } __find_and_remove() { find "${2:-/etc}" -iname "$1" -exec rm -Rfv {} \; 2>/dev/null || true } # - - - - - - - - - - - - - - - - - - - - - - - - - __pgrep() { - local count=3 - local srvc="${1:-SERVICE_NAME}" + local srvc="$1" count=3 + [ -z "$srvc" ] && return 10 while [ $count -ge 0 ]; do - # Use exact process name matching, not full command line search - pgrep -x "$srvc" >/dev/null 2>&1 && return 0 - sleep 1 + pgrep -x "$srvc" &>/dev/null && return 0 + pgrep -f "$srvc" &>/dev/null && return 0 + ps -ef 2>/dev/null | grep -v 'grep' | grep -qw "$srvc" && return 0 + [ $count -gt 0 ] && sleep 1 count=$((count - 1)) done return 10 } # - - - - - - - - - - - - - - - - - - - - - - - - - __find_file_relative() { - if [ ! -e "$1" ]; then - return 0 - fi - find "$1"/* -not -path '*env/*' -not -path '.git*' -type f 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '.' || true + [ -e "$1" ] || return 0 + find "$1"/* -not -path '*env/*' -not -path '.git*' -type f 2>/dev/null \ + | sort -u \ + | sed "s|^$1/||" || true } # - - - - - - - - - - - - - - - - - - - - - - - - - __find_directory_relative() { - if [ ! -d "$1" ]; then - return 0 - fi - find "$1"/* -not -path '*env/*' -not -path '.git*' -type d 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '.' || true + [ -d "$1" ] || return 0 + find "$1"/* -not -path '*env/*' -not -path '.git*' -type d 2>/dev/null \ + | sort -u \ + | sed "s|^$1/||" || true } # - - - - - - - - - - - - - - - - - - - - - - - - - -__pid_exists() { - local result="" - result="$(ps -ax --no-header 2>/dev/null | sed 's/^[[:space:]]*//g' | awk -F' ' '{print $1}' | sed 's|:||g' | grep '[0-9]' | sort -uV | grep "^$1$" 2>/dev/null || echo '')" - if [ -n "$result" ]; then - return 0 - else - return 1 - fi -} +__pid_exists() { [ -n "$1" ] && [ -d "/proc/$1" ]; } __is_running() { - local result="" - result="$(ps -eo args --no-header 2>/dev/null | awk '{print $1,$2,$3}' | sed 's|:||g' | sort -u | grep -vE 'grep|COMMAND|awk|tee|ps|sed|sort|tail' | grep "$1" | grep "${2:-^}" 2>/dev/null || echo '')" - if [ -n "$result" ]; then - return 0 + local pat="$1" + [ -n "$2" ] && pat="$pat.*$2" + if command -v pgrep &>/dev/null; then + pgrep -f "$pat" &>/dev/null else - return 1 + ps -eo args 2>/dev/null | grep -v grep | grep -Eq "$pat" fi } __get_pid() { - local result="" - result="$(ps -ax --no-header 2>/dev/null | sed 's/^[[:space:]]*//g;s|;||g;s|:||g' | awk '{print $1,$5}' | sed 's|:||g' | grep "$1$" | grep -v 'grep' | awk -F' ' '{print $1}' | grep '[0-9]' | sort -uV | head -n1 | grep '.' 2>/dev/null || echo '')" - if [ -n "$result" ]; then - echo "$result" - return 0 - else + if [ -z "$1" ]; then + [ "$DEBUGGER" = "on" ] && echo "Warning: __get_pid called without process name" >&2 return 1 fi + local pid + pid=$(pgrep -x "$1" 2>/dev/null | head -n1) + if [ -n "$pid" ]; then + echo "$pid" + return 0 + fi + [ "$DEBUGGER" = "on" ] && echo "Debug: No PID found for process: $1" >&2 + return 1 } # - - - - - - - - - - - - - - - - - - - - - - - - - -__format_variables() { printf '%s\n' "${@//,/ }" | tr ' ' '\n' | sort -RVu | grep -v '^$' | tr '\n' ' ' | __clean_variables | grep '.' || return 0; } +__format_variables() { + local input="${*//,/ }" + [ -z "$input" ] && return 0 + printf '%s\n' $input | sort -Ru | tr '\n' ' ' +} # - - - - - - - - - - - - - - - - - - - - - - - - - __clean_variables() { local var="$*" - var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters - var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters - var="$(printf '%s\n' "$var" | sed 's/\( \)*/\1/g;s|^ ||g')" - printf '%s' "$var" | grep -v '^$' + var="${var#"${var%%[![:space:]]*}"}" + var="${var%"${var##*[![:space:]]}"}" + while [[ 202605051922-gitar == *" "* ]]; do var="${var// / }"; done + [ -n "202605051922-gitar" ] && printf '%s' "$var" } # - - - - - - - - - - - - - - - - - - - - - - - - - __no_exit() { @@ -235,7 +200,17 @@ __no_exit() { local failed_services="" local failure_count=0 - [ -f "/run/.no_exit.pid" ] && return 0 + # only return early if the recorded PID is still alive; a leftover + # pid file from a prior container life (docker restart) would otherwise + # cause us to exit instead of entering the monitor loop. + if [ -f "/run/.no_exit.pid" ]; then + local no_exit_pid + no_exit_pid=$(<"/run/.no_exit.pid") 2>/dev/null + if [ -n "$no_exit_pid" ] && kill -0 "$no_exit_pid" 2>/dev/null; then + return 0 + fi + rm -f /run/.no_exit.pid 2>/dev/null || true + fi exec bash -c " trap 'echo \"Container shutdown requested\"; rm -f /run/.no_exit.pid /run/*.pid; exit 0' TERM INT @@ -270,10 +245,10 @@ __no_exit() { # - - - - - - - - - - - - - - - - - - - - - - - - - __trim() { local var="${*//;/ }" - var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters - var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters - var="$(echo "$var" | __remove_extra_spaces | sed "s| |; |g;s|;$| |g" | __remove_extra_spaces)" - printf '%s' "$var" | sed 's|;||g' | grep -v '^$' + var="${var#"${var%%[![:space:]]*}"}" + var="${var%"${var##*[![:space:]]}"}" + while [[ 202605051922-gitar == *" "* ]]; do var="${var// / }"; done + [ -n "202605051922-gitar" ] && printf '%s' "$var" } # - - - - - - - - - - - - - - - - - - - - - - - - - __banner() { @@ -295,21 +270,25 @@ __service_banner() { printf '# - - - %s %-*s %s - - - #\n' "$icon" "$text_width" "$full_message" "$icon" } # - - - - - - - - - - - - - - - - - - - - - - - - - -__find_php_bin() { find -L '/usr'/*bin -maxdepth 4 -name 'php-fpm*' 2>/dev/null | head -n1 | grep '.' || echo ''; } -__find_php_ini() { find -L '/etc' -maxdepth 4 -name 'php.ini' 2>/dev/null | head -n1 | sed 's|/php.ini||g' | grep '.' || echo ''; } +__find_php_bin() { find -L '/usr'/*bin -maxdepth 4 -name 'php-fpm*' 2>/dev/null | head -n1; } +__find_php_ini() { + local f + f=$(find -L '/etc' -maxdepth 4 -name 'php.ini' 2>/dev/null | head -n1) + [ -n "$f" ] && printf '%s\n' "${f%/php.ini}" +} # - - - - - - - - - - - - - - - - - - - - - - - - - -__find_nginx_conf() { find -L '/etc' -maxdepth 4 -name 'nginx.conf' 2>/dev/null | head -n1 | grep '.' || echo ''; } -__find_caddy_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'caddy.conf' 2>/dev/null | head -n1 | grep '.' || echo ''; } -__find_lighttpd_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'lighttpd.conf' 2>/dev/null | head -n1 | grep '.' || echo ''; } -__find_cherokee_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'cherokee.conf' 2>/dev/null | head -n1 | grep '.' || echo ''; } -__find_httpd_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'httpd.conf' -o -iname 'apache2.conf' 2>/dev/null | head -n1 | grep '.' || echo ''; } +__find_nginx_conf() { find -L '/etc' -maxdepth 4 -name 'nginx.conf' 2>/dev/null | head -n1; } +__find_caddy_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'caddy.conf' 2>/dev/null | head -n1; } +__find_lighttpd_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'lighttpd.conf' 2>/dev/null | head -n1; } +__find_cherokee_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'cherokee.conf' 2>/dev/null | head -n1; } +__find_httpd_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'httpd.conf' -o -iname 'apache2.conf' 2>/dev/null | head -n1; } # - - - - - - - - - - - - - - - - - - - - - - - - - -__find_mysql_conf() { find -L '/etc' -maxdepth 4 -type f -name 'my.cnf' 2>/dev/null | head -n1 | grep '.' || echo ''; } -__find_pgsql_conf() { find -L '/var/lib' '/etc' -maxdepth 8 -type f -name 'postgresql.conf' 2>/dev/null | head -n1 | grep '.' || echo ''; } +__find_mysql_conf() { find -L '/etc' -maxdepth 4 -type f -name 'my.cnf' 2>/dev/null | head -n1; } +__find_pgsql_conf() { find -L '/var/lib' '/etc' -maxdepth 8 -type f -name 'postgresql.conf' 2>/dev/null | head -n1; } __find_couchdb_conf() { return; } __find_mongodb_conf() { return; } # - - - - - - - - - - - - - - - - - - - - - - - - - -__random_password() { cat "/dev/urandom" | tr -dc '0-9a-zA-Z' | head -c${1:-16} && echo ""; } +__random_password() { tr -dc '0-9a-zA-Z' < /dev/urandom | head -c${1:-16} && echo ""; } # - - - - - - - - - - - - - - - - - - - - - - - - - __init_working_dir() { local service_name="$SERVICE_NAME" # get service name @@ -472,7 +451,8 @@ __display_user_info() { # - - - - - - - - - - - - - - - - - - - - - - - - - __init_config_etc() { local copy="no" - local name="$(find "/etc/$SERVICE_NAME" -maxdepth 0 2>/dev/null | head -n1)" + local name="" + [ -e "/etc/$SERVICE_NAME" ] && name="/etc/$SERVICE_NAME" local etc_dir="${ETC_DIR:-/etc/$name}" local conf_dir="${CONF_DIR:-/config/$name}" __is_dir_empty "$conf_dir" && copy=yes @@ -614,7 +594,7 @@ __cron() { fi [ $# -eq 0 ] && echo "Usage: cron [interval] [command]" && exit 1 local command="$*" - local bin="$(basename "${CRON_NAME:-$1}")" + local bin="${CRON_NAME:-$1}"; bin="${bin##*/}" [ -d "/run/cron" ] || mkdir -p "/run/cron" echo "$pid" >"/run/cron/$bin.pid" echo "$command" >"/run/cron/$bin.run" @@ -640,8 +620,8 @@ __find_replace() { # - - - - - - - - - - - - - - - - - - - - - - - - - # /config > /etc __copy_templates() { - local from="$1" to="$2" - is_link="$(ls -la "$dest" 2>/dev/null | awk '{print $NF}')" + local from="$1" to="$2" is_link="" + [ -L "$to" ] && is_link="$(readlink "$to")" [ "$from" != "$is_link" ] || return 0 if [ -e "$from" ] && __is_dir_empty "$to"; then __file_copy "$from" "$to" @@ -651,16 +631,18 @@ __copy_templates() { # /config/file > /etc/file __symlink() { local from="$1" to="$2" - if [ -e "$to" ]; then - [ -e "$from" ] && __rm "$from" - ln -sf "$to" "$from" && echo "Created symlink to $from > $to" - fi + [ -e "$to" ] || return 0 + [ "$from" = "$to" ] && return 0 + __rm "$from" + [ -d "${from%/*}" ] || mkdir -p "${from%/*}" 2>/dev/null + ln -sf "$to" "$from" && echo "Created symlink to $from > $to" } # - - - - - - - - - - - - - - - - - - - - - - - - - __file_copy() { local from="$1" local dest="$2" - is_link="$(ls -la "$dest" 2>/dev/null | awk '{print $NF}')" + local is_link="" + [ -L "$dest" ] && is_link="$(readlink "$dest")" if [ "$from" != "$is_link" ]; then if [ -n "$from" ] && [ -e "$from" ] && [ -n "$dest" ]; then if [ -d "$from" ]; then @@ -757,20 +739,40 @@ __fix_permissions() { fi } # - - - - - - - - - - - - - - - - - - - - - - - - - -__get_gid() { grep "^$1:" /etc/group 2>/dev/null | awk -F ':' '{print $3}' || return 1; } -__get_uid() { grep "^$1:" /etc/passwd 2>/dev/null | awk -F ':' '{print $3}' || return 1; } -__check_for_uid() { cat "/etc/passwd" 2>/dev/null | awk -F ':' '{print $3}' | sort -u | grep -q "^$1$" 2>/dev/null || return 1; } -__check_for_guid() { cat "/etc/group" 2>/dev/null | awk -F ':' '{print $3}' | sort -u | grep -q "^$1$" 2>/dev/null || return 1; } -__check_for_user() { cat "/etc/passwd" 2>/dev/null | awk -F ':' '{print $1}' | sort -u | grep -q "^$1$" 2>/dev/null || return 1; } -__check_for_group() { cat "/etc/group" 2>/dev/null | awk -F ':' '{print $1}' | sort -u | grep -q "^$1$" 2>/dev/null || return 1; } +__get_gid() { awk -F: -v n="$1" '$1==n {print $3; found=1; exit} END {exit !found}' /etc/group 2>/dev/null; } +__get_uid() { awk -F: -v n="$1" '$1==n {print $3; found=1; exit} END {exit !found}' /etc/passwd 2>/dev/null; } +__check_for_uid() { awk -F: -v n="$1" '$3==n {found=1; exit} END {exit !found}' /etc/passwd 2>/dev/null; } +__check_for_guid() { awk -F: -v n="$1" '$3==n {found=1; exit} END {exit !found}' /etc/group 2>/dev/null; } +__check_for_user() { awk -F: -v n="$1" '$1==n {found=1; exit} END {exit !found}' /etc/passwd 2>/dev/null; } +__check_for_group() { awk -F: -v n="$1" '$1==n {found=1; exit} END {exit !found}' /etc/group 2>/dev/null; } # - - - - - - - - - - - - - - - - - - - - - - - - - # check if process is already running __proc_check() { - cmd_bin="$(type -P "${1:-$EXEC_CMD_BIN}")" - cmd_name="$(basename "${cmd_bin:-$EXEC_CMD_NAME}")" - if __pgrep "$cmd_bin" || __pgrep "$cmd_name"; then + # Skip process check for one-shot/configuration services + if [ "$SERVICE_USES_PID" = "no" ]; then + return 1 + fi + local cmd_bin cmd_name check_result + cmd_bin="$(type -P "${1:-$EXEC_CMD_BIN}" 2>/dev/null || echo "${1:-$EXEC_CMD_BIN}")" + cmd_name="${cmd_bin:-${1:-$EXEC_CMD_NAME}}"; cmd_name="${cmd_name##*/}" + if [ -z "$cmd_name" ] || [ "$cmd_name" = "." ]; then + return 1 + fi + check_result=1 + if [ -n "$cmd_bin" ] && __pgrep "$cmd_bin" 2>/dev/null; then + check_result=0 + elif [ -n "$cmd_name" ] && __pgrep "$cmd_name" 2>/dev/null; then + check_result=0 + elif [ -f "$SERVICE_PID_FILE" ]; then + local pid_from_file + pid_from_file=$(<"$SERVICE_PID_FILE") 2>/dev/null + if [ -n "$pid_from_file" ] && kill -0 "$pid_from_file" 2>/dev/null; then + check_result=0 + fi + fi + if [ $check_result -eq 0 ]; then SERVICE_IS_RUNNING="yes" - touch "$SERVICE_PID_FILE" + touch "$SERVICE_PID_FILE" 2>/dev/null || true return 0 else return 1 @@ -824,11 +826,11 @@ __create_service_user() { return 0 fi # Validate user/group name format (alphanumeric, underscore, hyphen; must start with letter or underscore) - if [ -n "$create_user" ] && ! echo "$create_user" | grep -qE '^[a-z_][a-z0-9_-]*$'; then + if [ -n "$create_user" ] && [[ ! "$create_user" =~ ^[a-z_][a-z0-9_-]*$ ]]; then echo "Error: Invalid username format '$create_user' - must start with letter/underscore, contain only lowercase alphanumeric, underscore, or hyphen" >&2 return 1 fi - if [ -n "$create_group" ] && ! echo "$create_group" | grep -qE '^[a-z_][a-z0-9_-]*$'; then + if [ -n "$create_group" ] && [[ ! "$create_group" =~ ^[a-z_][a-z0-9_-]*$ ]]; then echo "Error: Invalid group name format '$create_group' - must start with letter/underscore, contain only lowercase alphanumeric, underscore, or hyphen" >&2 return 1 fi @@ -858,11 +860,11 @@ __create_service_user() { create_gid="$random_id" fi # Validate UID/GID are numeric and within valid range - if ! echo "$create_uid" | grep -qE '^[0-9]+$' || [ "$create_uid" -lt 1 ] || [ "$create_uid" -gt 65534 ]; then + if [[ ! "$create_uid" =~ ^[0-9]+$ ]] || [ "$create_uid" -lt 1 ] || [ "$create_uid" -gt 65534 ]; then echo "Error: Invalid UID '$create_uid' - must be a number between 1 and 65534" >&2 return 1 fi - if ! echo "$create_gid" | grep -qE '^[0-9]+$' || [ "$create_gid" -lt 1 ] || [ "$create_gid" -gt 65534 ]; then + if [[ ! "$create_gid" =~ ^[0-9]+$ ]] || [ "$create_gid" -lt 1 ] || [ "$create_gid" -gt 65534 ]; then echo "Error: Invalid GID '$create_gid' - must be a number between 1 and 65534" >&2 return 1 fi @@ -947,9 +949,7 @@ __create_env_file() { dir="$(dirname "$create_env")" [ -d "$dir" ] || mkdir -p "$dir" if [ -n "$create_env" ] && [ ! -f "$create_env" ]; then - cat </dev/null -$(<"$sample_file") -EOF + cp -f "$sample_file" "$create_env" fi [ -f "$create_env" ] || envStatus=$((1 + envStatus)) done @@ -958,17 +958,17 @@ EOF } # - - - - - - - - - - - - - - - - - - - - - - - - - __exec_command() { - local bin="" local arg=("$@") - local exitCode="0" + local exitCode=0 local cmdExec="${arg:-}" local pre_exec="--login -c" - local shell="$(type -P bash 2>/dev/null || type -P dash 2>/dev/null || type -P ash 2>/dev/null || type -P sh 2>/dev/null)" - bin="$(echo "${arg[*]}" | tr ' ' '\n' | grep -v '^$' | head -n1 | sed 's| ||g' || echo 'bash')" + local shell bin prog + shell=$(type -P bash || type -P dash || type -P ash || type -P sh) 2>/dev/null + bin="${arg[0]:-bash}" prog="$(type -P "$bin" 2>/dev/null || echo "$bin")" - if type -t $bin >/dev/null 2>&1; then + if type -t "$bin" &>/dev/null; then echo "${exec_message:-Executing command: $cmdExec}" - eval $shell $pre_exec "$cmdExec" || exitCode=1 + eval "$shell" $pre_exec "$cmdExec" exitCode=$? elif [ -f "$prog" ]; then echo "$prog is not executable" @@ -997,7 +997,9 @@ __start_init_scripts() { local critical_failures="0" local pidFile="/run/.start_init_scripts.pid" local init_dir="${1:-/usr/local/etc/docker/init.d}" - local init_count="$(ls -A "$init_dir"/* 2>/dev/null | grep -v '\.sample' | wc -l)" + local init_files=("$init_dir"/*.sh) + local init_count=0 + [ -e "${init_files[0]}" ] && init_count=${#init_files[@]} local exit_on_failure="${EXIT_ON_SERVICE_FAILURE:-true}" # Clean stale PID files from previous runs @@ -1013,7 +1015,10 @@ __start_init_scripts() { while :; do echo "Running: $(date)" >"/data/logs/init/keep_alive" && sleep 3600; done & else if [ -d "$init_dir" ]; then - [ -f "$init_dir/service.sample" ] && __rm "$init_dir"/*.sample + local sample + for sample in "$init_dir"/*.sample; do + [ -e "$sample" ] && __rm "$sample" + done chmod -Rf 755 "$init_dir"/*.sh echo "🚀 Starting container services initialization" @@ -1025,9 +1030,9 @@ __start_init_scripts() { for init in "$init_dir"/*.sh; do if [ -x "$init" ]; then touch "$pidFile" - name="$(basename "$init")" - service="$(printf '%s' "$name" | sed 's/^[^-]*-//;s|.sh$||g')" - __service_banner "🔧" "Executing service script:" "$(basename "$init")" + name="${init##*/}" + service="${name#*-}"; service="${service%.sh}" + __service_banner "🔧" "Executing service script:" "${init##*/}" # Execute the init script and capture the exit code if source "$init"; then # Check if service was disabled first @@ -1044,52 +1049,48 @@ __start_init_scripts() { sleep 1 # Check for service success indicators local expected_pid_file="/run/init.d/$service.pid" + set +e + # Check if this is a configuration service (no daemon process expected) if [ "$SERVICE_USES_PID" = "no" ]; then - # Service doesn't use PID files - check if expected PID file exists or assume success - if [ -f "$expected_pid_file" ]; then - retPID="$(cat "$expected_pid_file" 2>/dev/null || echo "0")" - initStatus="0" - __service_banner "✅" "Service $service started successfully -" "PID file" - else - initStatus="0" - __service_banner "✅" "Service $service started successfully -" "no PID tracking" - fi + # Configuration service - no daemon process expected + initStatus="0" + __service_banner "✅" "Service $service completed successfully -" "configuration service" else # Service uses PID tracking - verify actual running processes - set +e # Temporarily disable exit on error retPID="" - # First, try to find actual running process with various name patterns - for name_variant in "$service" "${service}84" "${service}d" "$(echo "$service" | sed 's/-//g')" "$(echo "$service" | tr -d '-')"; do + local found_process="" + # Try multiple name variants to find the process + for name_variant in "$service" "${service}84" "${service}d" "${service//-/}"; do if [ -z "$retPID" ]; then retPID=$(__get_pid "$name_variant" 2>/dev/null || echo "") - [ -n "$retPID" ] && found_process="$name_variant" && break + if [ -n "$retPID" ] && [ "$retPID" != "0" ]; then + found_process="$name_variant" + break + fi fi done - set -e # Re-enable exit on error if [ -n "$retPID" ] && [ "$retPID" != "0" ]; then # Found actual running process initStatus="0" __service_banner "✅" "Service $service started successfully -" "PID: ${retPID} ($found_process)" elif [ -f "$expected_pid_file" ]; then # No running process but PID file exists - verify PID is valid - file_pid="$(cat "$expected_pid_file" 2>/dev/null || echo "")" + file_pid=$(<"$expected_pid_file") 2>/dev/null if [ -n "$file_pid" ] && kill -0 "$file_pid" 2>/dev/null; then initStatus="0" __service_banner "✅" "Service $service started successfully -" "PID: $file_pid (from file)" - elif [ -n "$file_pid" ]; then - initStatus="1" - critical_failures=$((critical_failures + 1)) - __service_banner "⚠️" "Service $service has stale PID file -" "process $file_pid not running" else + # PID file exists but process isn't running - treat as warning, not failure initStatus="0" - __service_banner "✅" "Service $service completed initialization -" "no process tracking" + __service_banner "⚠️" "Service $service may not be running -" "no process found (non-critical)" fi else - # No process and no PID file - this is likely a configuration-only service + # No process and no PID file - likely a configuration-only service initStatus="0" __service_banner "✅" "Service $service completed successfully -" "configuration service" fi fi + set -e fi else initStatus="1" @@ -1102,15 +1103,19 @@ __start_init_scripts() { done # Summary + echo "" if [ $critical_failures -gt 0 ]; then - echo "⚠️ Warning: $critical_failures service(s) failed to start" - if [ "$exit_on_failure" = "true" ] && [ $critical_failures -ge 1 ]; then - echo "❌ Exiting due to critical service failures" + echo "⚠️ Warning: $critical_failures critical service(s) reported failures" + if [ "$exit_on_failure" = "true" ] && [ $critical_failures -ge 2 ]; then + echo "❌ Exiting due to multiple critical service failures (threshold: 2)" return 1 + else + echo "ℹ️ Continuing with $critical_failures failure(s) - container may still be functional" fi else - echo "✅ All services started successfully" + echo "✅ All service initializations completed successfully" fi + echo "" fi fi @@ -1129,14 +1134,14 @@ __setup_mta() { local local_hostname="${FULL_DOMAIN_NAME:-}" local account_user="${SERVER_ADMIN//@*/}" local account_domain="${EMAIL_DOMAIN//*@/}" - echo "$EMAIL_RELAY" | grep '[0-9][0-9]' || relay_port="465" + [[ $EMAIL_RELAY == *[0-9][0-9]* ]] || relay_port="465" ################# sSMTP relay setup - if [ -n "$(type -P 'ssmtp')" ]; then + if command -v ssmtp &>/dev/null; then [ -d "/config/ssmtp" ] || mkdir -p "/config/ssmtp" [ -f "/etc/ssmtp/ssmtp.conf" ] && __rm "/etc/ssmtp/ssmtp.conf" symlink_files="$(__find_file_relative "/config/ssmtp")" if [ ! -f "/config/ssmtp/ssmtp.conf" ]; then - cat </dev/null + cat >"/config/ssmtp/ssmtp.conf" </dev/null; then [ -d "/etc/postfix" ] || mkdir -p "/etc/postfix" [ -d "/config/postfix" ] || mkdir -p "/config/postfix" [ -f "/etc/postfix/main.cf" ] && __rm "/etc/postfix/main.cf" symlink_files="$(__find_file_relative "/config/postfix")" if [ ! -f "/config/postfix/main.cf" ]; then - cat </dev/null + cat >"/config/postfix/main.cf" </dev/null | sed 's|'/config/'||g' | sort -u | grep -v '^$' | grep '.' || false)" - directories="$(find "$conf_dir"/* -not -path '*/env/*' -type d 2>/dev/null | sed 's|'/config/'||g' | sort -u | grep -v '^$' | grep '.' || false)" + files=$(find "$conf_dir"/* -not -path '*/env/*' -type f 2>/dev/null | sort -u | sed 's|/config/||') + directories=$(find "$conf_dir"/* -not -path '*/env/*' -type d 2>/dev/null | sort -u | sed 's|/config/||') echo "Copying config files to system: $conf_dir > /etc/${conf_dir//\/config\//}" if [ -n "$directories" ]; then for d in $directories; do @@ -1356,7 +1361,7 @@ __initialize_custom_bin_dir() { echo "Setting up bin $SET_USR_BIN > $LOCAL_BIN_DIR" for create_bin_template in $SET_USR_BIN; do if [ -n "$create_bin_template" ]; then - create_bin_name="$(basename "$create_bin_template")" + create_bin_name="${create_bin_template##*/}" if [ -e "$create_bin_template" ]; then ln -sf "$create_bin_template" "$LOCAL_BIN_DIR/$create_bin_name" fi @@ -1367,51 +1372,85 @@ __initialize_custom_bin_dir() { } # - - - - - - - - - - - - - - - - - - - - - - - - - __initialize_default_templates() { + local errors=0 if [ -n "$DEFAULT_TEMPLATE_DIR" ]; then if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -d "/config" ]; then - echo "Copying default config files $DEFAULT_TEMPLATE_DIR > /config" + __log_info "Copying default config files $DEFAULT_TEMPLATE_DIR > /config" + if [ ! -d "$DEFAULT_TEMPLATE_DIR" ]; then + __log_warn "Template directory not found: $DEFAULT_TEMPLATE_DIR" + return 0 + fi for create_config_template in "$DEFAULT_TEMPLATE_DIR"/*; do - if [ -n "$create_config_template" ]; then - create_template_name="$(basename "$create_config_template")" + if [ -e "$create_config_template" ]; then + create_template_name="${create_config_template##*/}" if [ -d "$create_config_template" ]; then - mkdir -p "/config/$create_template_name/" - __is_dir_empty "/config/$create_template_name" && cp -Rf "$create_config_template/." "/config/$create_template_name/" 2>/dev/null - elif [ -e "$create_config_template" ]; then - [ -e "/config/$create_template_name" ] || cp -Rf "$create_config_template" "/config/$create_template_name" 2>/dev/null + mkdir -p "/config/$create_template_name/" || errors=$((errors + 1)) + if __is_dir_empty "/config/$create_template_name"; then + if ! cp -Rf "$create_config_template/." "/config/$create_template_name/" 2>/dev/null; then + __log_warn "Failed to copy template directory: $create_template_name" + errors=$((errors + 1)) + fi + fi + elif [ -f "$create_config_template" ]; then + if [ ! -e "/config/$create_template_name" ]; then + if ! cp -Rf "$create_config_template" "/config/$create_template_name" 2>/dev/null; then + __log_warn "Failed to copy template file: $create_template_name" + errors=$((errors + 1)) + fi + fi fi fi done unset create_config_template create_template_name + __log_debug "Template initialization completed with $errors errors" fi fi + return 0 } # - - - - - - - - - - - - - - - - - - - - - - - - - __initialize_config_dir() { + local errors=0 if [ -n "$DEFAULT_CONF_DIR" ]; then if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -d "/config" ]; then - echo "Copying custom config files: $DEFAULT_CONF_DIR > /config" + __log_info "Copying custom config files: $DEFAULT_CONF_DIR > /config" + if [ ! -d "$DEFAULT_CONF_DIR" ]; then + __log_warn "Config directory not found: $DEFAULT_CONF_DIR" + return 0 + fi for create_config_template in "$DEFAULT_CONF_DIR"/*; do - create_config_name="$(basename "$create_config_template")" - if [ -n "$create_config_template" ]; then + if [ -e "$create_config_template" ]; then + create_config_name="${create_config_template##*/}" if [ -d "$create_config_template" ]; then - mkdir -p "/config/$create_config_name" - __is_dir_empty "/config/$create_config_name" && cp -Rf "$create_config_template/." "/config/$create_config_name/" 2>/dev/null - elif [ -e "$create_config_template" ]; then - [ -e "/config/$create_config_name" ] || cp -Rf "$create_config_template" "/config/$create_config_name" 2>/dev/null + mkdir -p "/config/$create_config_name" || errors=$((errors + 1)) + if __is_dir_empty "/config/$create_config_name"; then + if ! cp -Rf "$create_config_template/." "/config/$create_config_name/" 2>/dev/null; then + __log_warn "Failed to copy config directory: $create_config_name" + errors=$((errors + 1)) + fi + fi + elif [ -f "$create_config_template" ]; then + if [ ! -e "/config/$create_config_name" ]; then + if ! cp -Rf "$create_config_template" "/config/$create_config_name" 2>/dev/null; then + __log_warn "Failed to copy config file: $create_config_name" + errors=$((errors + 1)) + fi + fi fi fi done unset create_config_template create_config_name + __log_debug "Config initialization completed with $errors errors" fi fi + return 0 } # - - - - - - - - - - - - - - - - - - - - - - - - - __initialize_data_dir() { if [ -d "/data" ]; then if [ "$DATA_DIR_INITIALIZED" = "false" ] && [ -n "$DEFAULT_DATA_DIR" ]; then - echo "Copying data files $DEFAULT_DATA_DIR > /data" + __log_info "Copying data files $DEFAULT_DATA_DIR > /data" for create_data_template in "$DEFAULT_DATA_DIR"/*; do - create_data_name="$(basename "$create_data_template")" + create_data_name="${create_data_template##*/}" if [ -n "$create_data_template" ]; then if [ -d "$create_data_template" ]; then mkdir -p "/data/$create_data_name" @@ -1447,11 +1486,11 @@ __is_htdocs_mounted() { WWW_ROOT_DIR="${WWW_ROOT_DIR:-/data/htdocs}" [ -n "$ENV_WWW_ROOT_DIR" ] && WWW_ROOT_DIR="$ENV_WWW_ROOT_DIR" if [ -n "$IMPORT_FROM_GIT" ]; then - if ! echo "$IMPORT_FROM_GIT" | grep -qE 'https://|http://|git://|ssh://'; then + if [[ ! "$IMPORT_FROM_GIT" =~ (https://|http://|git://|ssh://) ]]; then unset IMPORT_FROM_GIT fi fi - if [ -n "$IMPORT_FROM_GIT" ] && [ "$(command -v "git" 2>/dev/null)" ]; then + if [ -n "$IMPORT_FROM_GIT" ] && command -v git &>/dev/null; then if __is_dir_empty "$WWW_ROOT_DIR"; then echo "Importing project from $IMPORT_FROM_GIT to $WWW_ROOT_DIR" git clone -q "$IMPORT_FROM_GIT" "$WWW_ROOT_DIR" @@ -1507,7 +1546,7 @@ __start_php_dev_server() { find "/usr/local/share/httpd" -type f -not -path '.git*' -iname '*.php' -exec sed -i 's|[<].*SERVER_ADDR.*[>]|'${CONTAINER_IP4_ADDRESS:-127.0.0.1}'|g' {} \; 2>/dev/null php -S 0.0.0.0:$PHP_DEV_SERVER_PORT -t "/usr/local/share/httpd" fi - if ! echo "$1" | grep -q "^/usr/local/share/httpd"; then + if [[ "$1" != "/usr/local/share/httpd"* ]]; then find "$1" -type f -not -path '.git*' -iname '*.php' -exec sed -i 's|[<].*SERVER_ADDR.*[>]|'${CONTAINER_IP4_ADDRESS:-127.0.0.1}'|g' {} \; 2>/dev/null php -S 0.0.0.0:$PHP_DEV_SERVER_PORT -t "$1" fi @@ -1528,16 +1567,16 @@ __switch_to_user() { if [ "$switch_user" = "root" ]; then su_exec="" su_cmd() { eval "$@" || return 1; } - elif [ "$(builtin type -P gosu)" ]; then + elif command -v gosu &>/dev/null; then su_exec="gosu $switch_user" su_cmd() { $su_exec "$@" || return 1; } - elif [ "$(builtin type -P runuser)" ]; then + elif command -v runuser &>/dev/null; then su_exec="runuser -u $switch_user" su_cmd() { $su_exec "$@" || return 1; } - elif [ "$(builtin type -P sudo)" ]; then + elif command -v sudo &>/dev/null; then su_exec="sudo -u $switch_user" su_cmd() { $su_exec "$@" || return 1; } - elif [ "$(builtin type -P su)" ]; then + elif command -v su &>/dev/null; then su_exec="su -s /bin/sh - $switch_user" su_cmd() { $su_exec -c "$@" || return 1; } else diff --git a/rootfs/usr/local/etc/docker/init.d/99-apprise.sh b/rootfs/usr/local/etc/docker/init.d/99-apprise.sh index 35bf3e8..c9c6811 100755 --- a/rootfs/usr/local/etc/docker/init.d/99-apprise.sh +++ b/rootfs/usr/local/etc/docker/init.d/99-apprise.sh @@ -1,263 +1,868 @@ #!/usr/bin/env bash # shellcheck shell=bash -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# casjaysdevdocker/apprise - nginx + gunicorn + apprise-api init.d -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# shellcheck disable=SC1003,SC2016,SC2031,SC2120,SC2155,SC2199,SC2317 -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' SIGINT SIGTERM EXIT -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}" -{ [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; } && echo "Enabling debugging" && set -xo pipefail -x$DEBUGGER_OPTIONS && export DEBUGGER="on" || set -o pipefail -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin" +# - - - - - - - - - - - - - - - - - - - - - - - - - +##@Version : 202605052024-git +# @@Author : Jason Hempstead +# @@Contact : jason@casjaysdev.pro +# @@License : WTFPL +# @@ReadME : 99-apprise.sh --help +# @@Copyright : Copyright: (c) 2026 Jason Hempstead, Casjays Developments +# @@Created : Wednesday, May 13, 2026 14:32 EDT +# @@File : 99-apprise.sh +# @@Description : init.d script for apprise +# @@Changelog : New script +# @@TODO : Better documentation +# @@Other : +# @@Resource : +# @@Terminal App : no +# @@sudo/root : no +# @@Template : other/start-service +# - - - - - - - - - - - - - - - - - - - - - - - - - +# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 +# - - - - - - - - - - - - - - - - - - - - - - - - - +set -e +# - - - - - - - - - - - - - - - - - - - - - - - - - +# run trap command on exit +trap '__trap_err_handler' ERR +trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGINT SIGTERM SIGPWR +# - - - - - - - - - - - - - - - - - - - - - - - - - +# ERR trap handler - smart about critical vs non-critical errors +__trap_err_handler() { + local retVal=$? + local command="$BASH_COMMAND" + # Ignore SIGPIPE and user interrupts + [ $retVal -eq 130 ] || [ $retVal -eq 141 ] && return $retVal + # Non-critical: file operations, text processing, user/group operations + if [[ "$command" =~ (mkdir|touch|chmod|chown|chgrp|ln|cp|mv|rm|echo|printf|cat|tee|sed|awk|grep|find|sort|uniq|adduser|addgroup|usermod|groupmod|id|getent) ]]; then + return 0 + fi + # Non-critical: conditional checks that might fail + if [[ "$command" =~ (test|\[|\[\[|kill -0|pgrep|pidof|ps) ]]; then + return 0 + fi + # Critical error - but only fail if service hasn't started yet + if [ "$SERVICE_IS_RUNNING" != "yes" ]; then + echo "Critical error (exit $retVal): $command" >&2 + kill -TERM 1 2>/dev/null || exit $retVal + fi + return 0 +} +# - - - - - - - - - - - - - - - - - - - - - - - - - SCRIPT_FILE="$0" SERVICE_NAME="apprise" +SCRIPT_NAME="${SCRIPT_FILE##*/}" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Function to exit appropriately based on context __script_exit() { - local exit_code="${1:-0}" - if [ "${BASH_SOURCE[0]}" != "${0}" ]; then return "$exit_code"; else exit "$exit_code"; fi + local exit_code="${1:-0}" + if [ "${BASH_SOURCE[0]}" != "${0}" ]; then + # Script is being sourced - use return + return "$exit_code" + else + # Script is being executed - use exit + exit "$exit_code" + fi } -SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)" -if [ ! -f "/run/.start_init_scripts.pid" ]; then - echo "__start_init_scripts function hasn't been Initialized" >&2 - SERVICE_IS_RUNNING="no" - __script_exit 1 +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Exit if service is disabled +if [ -n "$APPRISE_ENABLED" ]; then + if [ "$APPRISE_ENABLED" != "yes" ]; then + export SERVICE_DISABLED="$SERVICE_NAME" + __script_exit 0 + fi fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html +[ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}" +if [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; then + echo "Enabling debugging" + set -xo pipefail -x$DEBUGGER_OPTIONS + export DEBUGGER="on" +else + set -o pipefail +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# import the functions file if [ -f "/usr/local/etc/docker/functions/entrypoint.sh" ]; then - . "/usr/local/etc/docker/functions/entrypoint.sh" + . "/usr/local/etc/docker/functions/entrypoint.sh" fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# import variables for set_env in "/root/env.sh" "/usr/local/etc/docker/env"/*.sh "/config/env"/*.sh; do - [ -f "$set_env" ] && . "$set_env" + if [ -f "$set_env" ]; then + . "$set_env" + fi done -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - +# exit if __start_init_scripts function hasn't been Initialized +if [ ! -f "/run/.start_init_scripts.pid" ]; then + echo "__start_init_scripts function hasn't been Initialized" >&2 + SERVICE_IS_RUNNING="no" + __script_exit 1 +fi +# Clean up any stale PID file for this service on startup +if [ -n "$SERVICE_NAME" ] && [ -f "/run/init.d/$SERVICE_NAME.pid" ]; then + old_pid=$(<"/run/init.d/$SERVICE_NAME.pid") 2>/dev/null + if [ -n "$old_pid" ] && ! kill -0 "$old_pid" 2>/dev/null; then + echo "Removing stale PID file for $SERVICE_NAME" + rm -f "/run/init.d/$SERVICE_NAME.pid" + fi +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Custom functions + +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Script to execute START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Reset environment before executing service RESET_ENV="no" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Set webroot WWW_ROOT_DIR="/usr/local/share/apprise-api/webapp" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Default predefined variables +# set data directory DATA_DIR="/data/apprise" +# set config directory CONF_DIR="/config/nginx" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# set the containers etc directory ETC_DIR="/etc/nginx" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# set the var dir VAR_DIR="" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# set the temp dir TMP_DIR="/tmp/apprise" +# set scripts pid dir RUN_DIR="/run/apprise" +# set log directory LOG_DIR="/data/logs/apprise" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Set the working dir WORK_DIR="" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# port which service is listening on SERVICE_PORT="8000" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# User to use to launch service RUNAS_USER="root" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# User and group in which the service switches to SERVICE_USER="root" SERVICE_GROUP="root" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Set password length RANDOM_PASS_USER="" RANDOM_PASS_ROOT="" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Set user and group ID SERVICE_UID="0" SERVICE_GID="0" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# execute command variables - keep single quotes; variables will be expanded later +# command to execute: start-apprise launches gunicorn then nginx EXEC_CMD_BIN='/usr/local/etc/docker/bin/start-apprise' +# command arguments EXEC_CMD_ARGS='' +# execute script before EXEC_PRE_SCRIPT='' +# apprise is a web server (nginx frontend); set to 'yes' for IS_WEB_SERVER logic +SERVICE_USES_PID='yes' +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Is this service a web server IS_WEB_SERVER="yes" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Is this service a database server IS_DATABASE_SERVICE="no" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Does this service use a database server USES_DATABASE_SERVICE="no" -DATABASE_SERVICE_TYPE="" -PRE_EXEC_MESSAGE="Apprise REST API listening on http://localhost:${SERVICE_PORT:-8000}/" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Set default type +DATABASE_SERVICE_TYPE="sqlite" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Show message before execute +PRE_EXEC_MESSAGE="Apprise REST API listening on http://localhost:\${SERVICE_PORT:-8000}/" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Set the wait time to execute __post_execute function - minutes POST_EXECUTE_WAIT_TIME="1" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Update path var PATH="$PATH:." +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Lets get containers ip address IP4_ADDRESS="$(__get_ip4)" IP6_ADDRESS="$(__get_ip6)" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Where to save passwords to ROOT_FILE_PREFIX="/config/secure/auth/root" USER_FILE_PREFIX="/config/secure/auth/user" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# root/admin user info [password/random] root_user_name="${APPRISE_ROOT_USER_NAME:-}" root_user_pass="${APPRISE_ROOT_PASS_WORD:-}" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Normal user info [password/random] user_name="${APPRISE_USER_NAME:-}" user_pass="${APPRISE_USER_PASS_WORD:-}" -[ -f "/config/env/apprise.script.sh" ] && . "/config/env/apprise.script.sh" -[ -f "/config/env/apprise.sh" ] && . "/config/env/apprise.sh" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Load variables from config +if [ -f "/config/env/apprise.script.sh" ]; then + . "/config/env/apprise.script.sh" +fi +# Overwrite the variables +if [ -f "/config/env/apprise.sh" ]; then + . "/config/env/apprise.sh" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Additional predefined variables + +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Additional variables + +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Specify custom directories to be created ADD_APPLICATION_FILES="" ADD_APPLICATION_DIRS="/usr/local/share/apprise-api /run/apprise /tmp/apprise /config/apprise/store /config/apprise/attach /config/apprise/plugin" +# - - - - - - - - - - - - - - - - - - - - - - - - - APPLICATION_FILES="$LOG_DIR/$SERVICE_NAME.log" -APPLICATION_DIRS="$ETC_DIR $CONF_DIR $LOG_DIR $TMP_DIR $RUN_DIR $VAR_DIR" +APPLICATION_DIRS="$ETC_DIR $CONF_DIR $DATA_DIR $LOG_DIR $TMP_DIR $RUN_DIR $VAR_DIR" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Additional config dirs - will be copied to /etc/$name ADDITIONAL_CONFIG_DIRS="/config/apprise" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# define variables to load into the service - escape quotes - var=\"value\",other=\"test\" CMD_ENV="APPRISE_CONFIG_DIR=/config/apprise/store,APPRISE_ATTACH_DIR=/config/apprise/attach,APPRISE_PLUGIN_PATHS=/config/apprise/plugin" -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Overwrite based on file/directory + +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Per Application Variables or imports + +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Custom commands to run before copying to /config __run_precopy() { - local hostname=${HOSTNAME} - if builtin type -t __run_precopy_local | grep -q 'function'; then __run_precopy_local; fi + # Define environment + local hostname=${HOSTNAME} + if [ ! -d "/run/healthcheck" ]; then + mkdir -p "/run/healthcheck" + fi + # Define actions/commands + + # allow custom functions + if builtin type -t __run_precopy_local | grep -q 'function'; then + __run_precopy_local + fi } +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Custom prerun functions - set up runtime dirs required by apprise + nginx __execute_prerun() { - local hostname=${HOSTNAME} - mkdir -p /run/apprise /tmp/apprise /data/logs/apprise \ - /config/apprise/store /config/apprise/attach /config/apprise/plugin \ - /config/apprise/conf.d - chmod 1777 /tmp/apprise 2>/dev/null || true - if builtin type -t __execute_prerun_local | grep -q 'function'; then __execute_prerun_local; fi + # Define environment + local hostname=${HOSTNAME} + # Define actions/commands + mkdir -p /run/apprise /tmp/apprise /data/logs/apprise \ + /config/apprise/store /config/apprise/attach /config/apprise/plugin \ + /config/apprise/conf.d + chmod 1777 /tmp/apprise 2>/dev/null || true + + # allow custom functions + if builtin type -t __execute_prerun_local | grep -q 'function'; then + __execute_prerun_local + fi } +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Run any pre-execution checks __run_pre_execute_checks() { - local exitStatus=0 - __banner "Running preexecute check for $SERVICE_NAME" - # Validate nginx config syntax - nginx -t -c /etc/nginx/nginx.conf 2>&1 | head -20 || exitStatus=$? - __banner "Finished preexecute check for $SERVICE_NAME: Status $exitStatus" - if [ $exitStatus -ne 0 ]; then - echo "The pre-execution check has failed" >&2 - [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE" - __script_exit 1 - fi - if builtin type -t __run_pre_execute_checks_local | grep -q 'function'; then __run_pre_execute_checks_local; fi - return $exitStatus + # Set variables + local exitStatus=0 + # message to show at start + local pre_execute_checks_MessageST="Running preexecute check for $SERVICE_NAME" + # message to show at completion + local pre_execute_checks_MessageEnd="Finished preexecute check for $SERVICE_NAME" + __banner "$pre_execute_checks_MessageST" + # Validate nginx config syntax + { + nginx -t -c /etc/nginx/nginx.conf 2>&1 | head -20 + } + exitStatus=$? + __banner "$pre_execute_checks_MessageEnd: Status $exitStatus" + + # show exit message + if [ $exitStatus -ne 0 ]; then + echo "The pre-execution check has failed" >&2 + if [ -f "$SERVICE_PID_FILE" ]; then + rm -Rf "$SERVICE_PID_FILE" + fi + __script_exit 1 + fi + # allow custom functions + if builtin type -t __run_pre_execute_checks_local | grep -q 'function'; then + __run_pre_execute_checks_local + fi + # exit function + return $exitStatus } +# - - - - - - - - - - - - - - - - - - - - - - - - - +# use this function to update config files - IE: change port __update_conf_files() { - local exitCode=0 - local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" - __replace "REPLACE_TZ" "${TZ:-UTC}" "/etc/nginx/nginx.conf" 2>/dev/null || true - if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi - return $exitCode + # default exit code + local exitCode=0 + # set hostname + local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" + # - - - - - - - - - - - - - - - - - - - - - - - - - + # Replace timezone placeholder if present + __replace "REPLACE_TZ" "${TZ:-UTC}" "/etc/nginx/nginx.conf" 2>/dev/null || true + + # - - - - - - - - - - - - - - - - - - - - - - - - - + # define actions + + # allow custom functions + if builtin type -t __update_conf_files_local | grep -q 'function'; then + __update_conf_files_local + fi + # exit function + return $exitCode } +# - - - - - - - - - - - - - - - - - - - - - - - - - +# function to run before executing __pre_execute() { - local exitCode=0 - sleep 2 - if builtin type -t __pre_execute_local | grep -q 'function'; then __pre_execute_local; fi - return $exitCode + # default exit code + local exitCode=0 + # set hostname + local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" + # - - - - - - - - - - - - - - - - - - - - - - - - - + # define actions to run after copying to /config + + # - - - - - - - - - - - - - - - - - - - - - - - - - + # unset unneeded variables + unset sysname + # Lets wait a few seconds before continuing + sleep 2 + # allow custom functions + if builtin type -t __pre_execute_local | grep -q 'function'; then + __pre_execute_local + fi + # exit function + return $exitCode } +# - - - - - - - - - - - - - - - - - - - - - - - - - +# function to run after executing __post_execute() { - local pid="" - local retVal=0 - local ctime=${POST_EXECUTE_WAIT_TIME:-1} - local waitTime=$((ctime * 60)) - sleep $waitTime - ( - __banner "Running post commands for $SERVICE_NAME" - # Drop the sample yaml into /config/apprise/ if not already present - if [ -f /usr/local/share/template-files/config/apprise/apprise.yml.sample ] && \ - [ ! -f /config/apprise/apprise.yml.sample ]; then - cp -f /usr/local/share/template-files/config/apprise/apprise.yml.sample /config/apprise/ 2>/dev/null || true - fi - __banner "Finished post commands for $SERVICE_NAME: Status $retVal" - ) 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" & - pid=$! - if builtin type -t __post_execute_local | grep -q 'function'; then __post_execute_local; fi - return $retVal + # init pid var + local pid="" + # set default exit code + local retVal=0 + # how long to wait before executing + local ctime=${POST_EXECUTE_WAIT_TIME:-1} + # convert minutes to seconds + local waitTime=$((ctime * 60)) + # message to show at start + local postMessageST="Running post commands for $SERVICE_NAME" + # message to show at completion + local postMessageEnd="Finished post commands for $SERVICE_NAME" + # wait + sleep $waitTime + # execute commands after waiting + ( + # show message + __banner "$postMessageST" + # Drop the sample apprise YAML into /config/apprise/ on first run + if [ -f /usr/local/share/template-files/config/apprise/apprise.yml.sample ] && \ + [ ! -f /config/apprise/apprise.yml.sample ]; then + cp -f /usr/local/share/template-files/config/apprise/apprise.yml.sample /config/apprise/ 2>/dev/null || true + fi + # show exit message + __banner "$postMessageEnd: Status $retVal" + ) 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" & + pid=$! + if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then + retVal=0 + else + retVal=10 + fi + # allow custom functions + if builtin type -t __post_execute_local | grep -q 'function'; then + __post_execute_local + fi + # exit function + return $retVal } +# - - - - - - - - - - - - - - - - - - - - - - - - - +# use this function to update config files - IE: change port __pre_message() { - local exitCode=0 - [ -n "$PRE_EXEC_MESSAGE" ] && eval echo "$PRE_EXEC_MESSAGE" - if builtin type -t __pre_message_local | grep -q 'function'; then __pre_message_local; fi - return $exitCode + local exitCode=0 + if [ -n "$PRE_EXEC_MESSAGE" ]; then + eval echo "$PRE_EXEC_MESSAGE" + fi + # execute commands + + # allow custom functions + if builtin type -t __pre_message_local | grep -q 'function'; then + __pre_message_local + fi + # exit function + return $exitCode } +# - - - - - - - - - - - - - - - - - - - - - - - - - +# use this function to setup ssl support __update_ssl_conf() { - local exitCode=0 - if builtin type -t __update_ssl_conf_local | grep -q 'function'; then __update_ssl_conf_local; fi - return $exitCode + local exitCode=0 + local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" + # execute commands + + # allow custom functions + if builtin type -t __update_ssl_conf_local | grep -q 'function'; then + __update_ssl_conf_local + fi + # set exitCode + return $exitCode } +# - - - - - - - - - - - - - - - - - - - - - - - - - __create_service_env() { - local exitCode=0 - if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ]; then - cat </dev/null -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + local exitCode=0 + if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ]; then + cat </dev/null +# - - - - - - - - - - - - - - - - - - - - - - - - - # Generated by 99-apprise.sh - edit to override defaults #APPRISE_WORKER_COUNT="" #APPRISE_WORKER_TIMEOUT="300" #APPRISE_BASE_URL="" #APPRISE_STATEFUL_MODE="simple" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# root/admin user info [password/random] +#ENV_ROOT_USER_NAME="${ENV_ROOT_USER_NAME:-$APPRISE_ROOT_USER_NAME}" # root user name +#ENV_ROOT_USER_PASS="${ENV_ROOT_USER_NAME:-$APPRISE_ROOT_PASS_WORD}" # root user password +#root_user_name="${ENV_ROOT_USER_NAME:-$root_user_name}" # +#root_user_pass="${ENV_ROOT_USER_PASS:-$root_user_pass}" # +# - - - - - - - - - - - - - - - - - - - - - - - - - +#Normal user info [password/random] +#ENV_USER_NAME="${ENV_USER_NAME:-$APPRISE_USER_NAME}" # +#ENV_USER_PASS="${ENV_USER_PASS:-$APPRISE_USER_PASS_WORD}" # +#user_name="${ENV_USER_NAME:-$user_name}" # normal user name +#user_pass="${ENV_USER_PASS:-$user_pass}" # normal user password + EOF - fi - if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" ]; then - __run_precopy_local() { true; } - __execute_prerun_local() { true; } - __run_pre_execute_checks_local() { true; } - __update_conf_files_local() { true; } - __pre_execute_local() { true; } - __post_execute_local() { true; } - __pre_message_local() { true; } - __update_ssl_conf_local() { true; } - fi - __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" || exitCode=$((exitCode + 1)) - __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" || exitCode=$((exitCode + 1)) - return $exitCode + fi + if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" ]; then + # - - - - - - - - - - - - - - - - - - - - - - - - - + __run_precopy_local() { true; } + # - - - - - - - - - - - - - - - - - - - - - - - - - + __execute_prerun_local() { true; } + # - - - - - - - - - - - - - - - - - - - - - - - - - + __run_pre_execute_checks_local() { true; } + # - - - - - - - - - - - - - - - - - - - - - - - - - + __update_conf_files_local() { true; } + # - - - - - - - - - - - - - - - - - - - - - - - - - + __pre_execute_local() { true; } + # - - - - - - - - - - - - - - - - - - - - - - - - - + __post_execute_local() { true; } + # - - - - - - - - - - - - - - - - - - - - - - - - - + __pre_message_local() { true; } + # - - - - - - - - - - - - - - - - - - - - - - - - - + __update_ssl_conf_local() { true; } + # - - - - - - - - - - - - - - - - - - - - - - - - - + fi + if ! __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"; then + exitCode=$((exitCode + 1)) + fi + if ! __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh"; then + exitCode=$((exitCode + 1)) + fi + return $exitCode } +# - - - - - - - - - - - - - - - - - - - - - - - - - +# script to start server __run_start_script() { - local runExitCode=0 - local cmd="$(eval echo "${EXEC_CMD_BIN:-}")" - local args="$(eval echo "${EXEC_CMD_ARGS:-}")" - local name="$(eval echo "${EXEC_CMD_NAME:-}")" - local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" - [ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ] && . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" - if [ ! -x "$cmd" ]; then echo "$cmd is not executable" >&2; return 2; fi - if __proc_check "nginx"; then echo "nginx already running" >&2; return 0; fi - echo "Starting $cmd $args" | tee -a -p "/data/logs/init.txt" - su_cmd touch "$SERVICE_PID_FILE" - if [ ! -f "$START_SCRIPT" ]; then - cat <"$START_SCRIPT" + local runExitCode=0 + # expand variables + local workdir="$(eval echo "${WORK_DIR:-}")" + # expand variables + local cmd="$(eval echo "${EXEC_CMD_BIN:-}")" + # expand variables + local args="$(eval echo "${EXEC_CMD_ARGS:-}")" + # expand variables + local name="$(eval echo "${EXEC_CMD_NAME:-}")" + # expand variables + local pre="$(eval echo "${EXEC_PRE_SCRIPT:-}")" + # expand variables + local extra_env="$(eval echo "${CMD_ENV//,/ }")" + # expand variables + local lc_type="$(eval echo "${LANG:-${LC_ALL:-$LC_CTYPE}}")" + # expand variables + local home="$(eval echo "${workdir//\/root/\/tmp\/docker}")" + # expand variables + local path="$(eval echo "$PATH")" + # expand variables + local message="$(eval echo "")" + local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" + if [ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ]; then + . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" + fi + # + if [ -z "$cmd" ]; then + __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" + retVal=$? + __log_info "Initialization of $SCRIPT_NAME has completed" + __script_exit $retVal + else + # ensure the command exists + if [ ! -x "$cmd" ]; then + __log_error "$name is not a valid executable" + return 2 + fi + # check and exit if already running (nginx as sentinel) + if __proc_check "nginx" || __proc_check "$cmd"; then + __log_debug "Service $name is already running" + return 0 + else + # - - - - - - - - - - - - - - - - - - - - - - - - - + # show message if env exists + if [ -n "$cmd" ]; then + if [ -n "$SERVICE_USER" ]; then + __log_info "Setting up $cmd to run as $SERVICE_USER" + else + SERVICE_USER="root" + fi + if [ -n "$SERVICE_PORT" ]; then + __log_info "$name will be running on port $SERVICE_PORT" + else + SERVICE_PORT="" + fi + fi + if [ -n "$pre" ] && command -v "$pre" &>/dev/null; then + export cmd_exec="$pre $cmd $args" + message="Starting service: $name $args through $pre" + else + export cmd_exec="$cmd $args" + message="Starting service: $name $args" + fi + if [ -n "$su_exec" ]; then + __log_debug "Using $su_exec" | tee -a -p "/data/logs/init.txt" + fi + __log_info "$message" | tee -a -p "/data/logs/init.txt" + su_cmd touch "$SERVICE_PID_FILE" + if [ "$RESET_ENV" = "yes" ]; then + env_command="$(echo "env -i HOME=\"$home\" LC_CTYPE=\"$lc_type\" PATH=\"$path\" HOSTNAME=\"$sysname\" USER=\"${SERVICE_USER:-$RUNAS_USER}\" $extra_env")" + execute_command="$(__trim "$su_exec $env_command $cmd_exec")" + if [ ! -f "$START_SCRIPT" ]; then + cat <"$START_SCRIPT" #!/usr/bin/env bash -trap 'exitCode=\$?;if [ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ]; then rm -Rf "\$SERVICE_PID_FILE"; fi; exit \$exitCode' EXIT +trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT +# set -Eeo pipefail +# Setting up $cmd to run as ${SERVICE_USER:-root} with env retVal=10 cmd="$cmd" +args="$args" SERVICE_NAME="$SERVICE_NAME" SERVICE_PID_FILE="$SERVICE_PID_FILE" -$cmd $args 2>>"/dev/stderr" >>"$LOG_DIR/$SERVICE_NAME.log" & +LOG_DIR="$LOG_DIR" +execute_command="$execute_command" +\$execute_command 2>"/dev/stderr" >>"\$LOG_DIR/\$SERVICE_NAME.log" & execPid=\$! -sleep 3 -checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || false)" -[ -n "\$execPid" ] && [ -n "\$checkPID" ] && echo "\$execPid" >"\$SERVICE_PID_FILE" && retVal=0 || retVal=10 -[ "\$retVal" = 0 ] && echo "\$cmd has been started" || echo "Failed to start $cmd $args" >&2 +sleep 1 +if [ -n "\$execPid" ] && kill -0 "\$execPid" 2>/dev/null; then + echo "\$execPid" >"\$SERVICE_PID_FILE" + retVal=0 + printf '%s\n' "\$SERVICE_NAME: \$execPid" >"/run/healthcheck/\$SERVICE_NAME" +else + retVal=10 + echo "Failed to start $execute_command" >&2 +fi exit \$retVal + EOF - fi - [ -x "$START_SCRIPT" ] || chmod 755 -Rf "$START_SCRIPT" - [ "$CONTAINER_INIT" = "yes" ] || eval sh -c "$START_SCRIPT" - runExitCode=$? - return $runExitCode + fi + else + if [ ! -f "$START_SCRIPT" ]; then + execute_command="$(__trim "$su_exec $cmd_exec")" + cat <"$START_SCRIPT" +#!/usr/bin/env bash +trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT +# +set -Eeo pipefail +# Setting up $cmd to run as ${SERVICE_USER:-root} +retVal=10 +cmd="$cmd" +args="$args" +SERVICE_NAME="$SERVICE_NAME" +SERVICE_PID_FILE="$SERVICE_PID_FILE" +LOG_DIR="$LOG_DIR" +execute_command="$execute_command" +\$execute_command 2>>"/dev/stderr" >>"\$LOG_DIR/\$SERVICE_NAME.log" & +execPid=\$! +sleep 1 +if [ -n "\$execPid" ] && kill -0 "\$execPid" 2>/dev/null; then + echo "\$execPid" >"\$SERVICE_PID_FILE" + retVal=0 +else + retVal=10 + echo "Failed to start $execute_command" >&2 +fi +exit \$retVal + +EOF + fi + fi + fi + if [ ! -x "$START_SCRIPT" ]; then + chmod 755 -Rf "$START_SCRIPT" + fi + if [ "$CONTAINER_INIT" != "yes" ]; then + eval sh -c "$START_SCRIPT" + runExitCode=$? + fi + fi + return $runExitCode } +# - - - - - - - - - - - - - - - - - - - - - - - - - +# username and password actions __run_secure_function() { - local filesperms - for filesperms in "${USER_FILE_PREFIX}"/* "${ROOT_FILE_PREFIX}"/*; do - [ -e "$filesperms" ] && { chmod -Rf 600 "$filesperms"; chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null; } - done 2>/dev/null - unset filesperms + local filesperms + if [ -n "$user_name" ] || [ -n "$user_pass" ]; then + for filesperms in "${USER_FILE_PREFIX}"/*; do + if [ -e "$filesperms" ]; then + chmod -Rf 600 "$filesperms" + chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null + fi + done 2>/dev/null | tee -p -a "/data/logs/init.txt" + fi + if [ -n "$root_user_name" ] || [ -n "$root_user_pass" ]; then + for filesperms in "${ROOT_FILE_PREFIX}"/*; do + if [ -e "$filesperms" ]; then + chmod -Rf 600 "$filesperms" + chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null + fi + done 2>/dev/null | tee -p -a "/data/logs/init.txt" + fi + unset filesperms } -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -__file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" && . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" -__file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" && . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Allow ENV_ variable - Import env file +if __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"; then + . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" +fi +if __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh"; then + . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# default exit code SERVICE_EXIT_CODE=0 -EXEC_CMD_NAME="$(basename -- "$EXEC_CMD_BIN")" +# application specific +EXEC_CMD_NAME="${EXEC_CMD_BIN##*/}" SERVICE_PID_FILE="/run/init.d/$EXEC_CMD_NAME.pid" -SERVICE_PID_NUMBER="$(__pgrep)" -__check_service "$1" && SERVICE_IS_RUNNING=yes -[ -d "$LOG_DIR" ] || mkdir -p "$LOG_DIR" -[ -d "$RUN_DIR" ] || mkdir -p "$RUN_DIR" -[ -n "$USER_FILE_PREFIX" ] && { [ -d "$USER_FILE_PREFIX" ] || mkdir -p "$USER_FILE_PREFIX"; } -[ -n "$ROOT_FILE_PREFIX" ] && { [ -d "$ROOT_FILE_PREFIX" ] || mkdir -p "$ROOT_FILE_PREFIX"; } -[ -n "$RUNAS_USER" ] || RUNAS_USER="root" -[ -n "$SERVICE_USER" ] || SERVICE_USER="$RUNAS_USER" -[ -n "$SERVICE_GROUP" ] || SERVICE_GROUP="${SERVICE_USER:-$RUNAS_USER}" -[ "$IS_WEB_SERVER" = "yes" ] && RESET_ENV="yes" && __is_htdocs_mounted -[ "$IS_WEB_SERVER" = "yes" ] && [ -z "$SERVICE_PORT" ] && SERVICE_PORT="8000" -[ -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ] && . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" +SERVICE_PID_NUMBER="$(__pgrep "$EXEC_CMD_NAME" 2>/dev/null || echo '')" +_resolved="$(type -P "$EXEC_CMD_BIN" 2>/dev/null)" +[ -n "$_resolved" ] && EXEC_CMD_BIN="$_resolved" +_resolved="$(type -P "$EXEC_PRE_SCRIPT" 2>/dev/null)" +[ -n "$_resolved" ] && EXEC_PRE_SCRIPT="$_resolved" +unset _resolved +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Only run check +if __check_service "$1"; then + SERVICE_IS_RUNNING=yes +else + SERVICE_IS_RUNNING="no" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# ensure needed directories exists +if [ ! -d "$LOG_DIR" ]; then + mkdir -p "$LOG_DIR" +fi +if [ ! -d "$RUN_DIR" ]; then + mkdir -p "$RUN_DIR" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# create auth directories +if [ -n "$USER_FILE_PREFIX" ]; then + if [ ! -d "$USER_FILE_PREFIX" ]; then + mkdir -p "$USER_FILE_PREFIX" + fi +fi +if [ -n "$ROOT_FILE_PREFIX" ]; then + if [ ! -d "$ROOT_FILE_PREFIX" ]; then + mkdir -p "$ROOT_FILE_PREFIX" + fi +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +if [ -z "$RUNAS_USER" ]; then + RUNAS_USER="root" +fi +if [ -z "$SERVICE_USER" ]; then + SERVICE_USER="$RUNAS_USER" +fi +if [ -z "$SERVICE_GROUP" ]; then + SERVICE_GROUP="${SERVICE_USER:-$RUNAS_USER}" +fi +if [ "$IS_WEB_SERVER" = "yes" ]; then + RESET_ENV="yes" + __is_htdocs_mounted +fi +if [ "$IS_WEB_SERVER" = "yes" ] && [ -z "$SERVICE_PORT" ]; then + SERVICE_PORT="8000" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Database env +if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then + RESET_ENV="no" + DATABASE_CREATE="${ENV_DATABASE_CREATE:-$DATABASE_CREATE}" + DATABASE_USER_NORMAL="${ENV_DATABASE_USER:-${DATABASE_USER_NORMAL:-$user_name}}" + DATABASE_PASS_NORMAL="${ENV_DATABASE_PASSWORD:-${DATABASE_PASS_NORMAL:-$user_pass}}" + DATABASE_USER_ROOT="${ENV_DATABASE_ROOT_USER:-${DATABASE_USER_ROOT:-$root_user_name}}" + DATABASE_PASS_ROOT="${ENV_DATABASE_ROOT_PASSWORD:-${DATABASE_PASS_ROOT:-$root_user_pass}}" + if [ -n "$DATABASE_PASS_NORMAL" ]; then + if [ ! -f "${USER_FILE_PREFIX}/db_pass_user" ]; then + echo "$DATABASE_PASS_NORMAL" >"${USER_FILE_PREFIX}/db_pass_user" + fi + fi + if [ -n "$DATABASE_PASS_ROOT" ]; then + if [ ! -f "${ROOT_FILE_PREFIX}/db_pass_root" ]; then + echo "$DATABASE_PASS_ROOT" >"${ROOT_FILE_PREFIX}/db_pass_root" + fi + fi +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Allow variables via imports - Overwrite existing +if [ -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ]; then + . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# set password to random if variable is random +if [ "$user_pass" = "random" ]; then + user_pass="$(__random_password ${RANDOM_PASS_USER:-16})" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +if [ "$root_user_pass" = "random" ]; then + root_user_pass="$(__random_password ${RANDOM_PASS_ROOT:-16})" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Allow setting initial users and passwords via environment and save to file +if [ -n "$user_name" ]; then + echo "$user_name" >"${USER_FILE_PREFIX}/${SERVICE_NAME}_name" +fi +if [ -n "$user_pass" ]; then + echo "$user_pass" >"${USER_FILE_PREFIX}/${SERVICE_NAME}_pass" +fi +if [ -n "$root_user_name" ]; then + echo "$root_user_name" >"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_name" +fi +if [ -n "$root_user_pass" ]; then + echo "$root_user_pass" >"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# create needed dirs +if [ ! -d "$LOG_DIR" ]; then + mkdir -p "$LOG_DIR" +fi +if [ ! -d "$RUN_DIR" ]; then + mkdir -p "$RUN_DIR" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Allow per init script usernames and passwords +if __file_exists_with_content "${USER_FILE_PREFIX}/${SERVICE_NAME}_name"; then + user_name="$(<"${USER_FILE_PREFIX}/${SERVICE_NAME}_name")" +fi +if __file_exists_with_content "${USER_FILE_PREFIX}/${SERVICE_NAME}_pass"; then + user_pass="$(<"${USER_FILE_PREFIX}/${SERVICE_NAME}_pass")" +fi +if __file_exists_with_content "${ROOT_FILE_PREFIX}/${SERVICE_NAME}_name"; then + root_user_name="$(<"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_name")" +fi +if __file_exists_with_content "${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass"; then + root_user_pass="$(<"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass")" +fi +if __file_exists_with_content "${USER_FILE_PREFIX}/db_pass_user"; then + DATABASE_PASS_NORMAL="$(<"${USER_FILE_PREFIX}/db_pass_user")" +fi +if __file_exists_with_content "${ROOT_FILE_PREFIX}/db_pass_root"; then + DATABASE_PASS_ROOT="$(<"${ROOT_FILE_PREFIX}/db_pass_root")" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# set hostname for script sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" +# - - - - - - - - - - - - - - - - - - - - - - - - - __create_service_env +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Setup /config directories __init_config_etc +# - - - - - - - - - - - - - - - - - - - - - - - - - +# pre-run function __execute_prerun +# - - - - - - - - - - - - - - - - - - - - - - - - - +# create user if needed __create_service_user "$SERVICE_USER" "$SERVICE_GROUP" "${WORK_DIR:-/home/$SERVICE_USER}" "${SERVICE_UID:-}" "${SERVICE_GID:-}" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Modify user if needed __set_user_group_id $SERVICE_USER ${SERVICE_UID:-} ${SERVICE_GID:-} +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Create base directories __setup_directories +# - - - - - - - - - - - - - - - - - - - - - - - - - +# set switch user command __switch_to_user +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Initialize the home/working dir __init_working_dir +# - - - - - - - - - - - - - - - - - - - - - - - - - +# show init message __pre_message +# - - - - - - - - - - - - - - - - - - - - - - - - - +# +__initialize_db_users +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Initialize ssl __update_ssl_conf __update_ssl_certs +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Set permissions in ${USER_FILE_PREFIX} and ${ROOT_FILE_PREFIX} __run_secure_function +# - - - - - - - - - - - - - - - - - - - - - - - - - __run_precopy +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Copy /config to /etc for config_2_etc in $CONF_DIR $ADDITIONAL_CONFIG_DIRS; do - __initialize_system_etc "$config_2_etc" 2>/dev/stderr | tee -p -a "/data/logs/init.txt" + __initialize_system_etc "$config_2_etc" 2>/dev/stderr | tee -p -a "/data/logs/init.txt" done +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Replace variables __initialize_replace_variables "$ETC_DIR" "$CONF_DIR" "$ADDITIONAL_CONFIG_DIRS" "$WWW_ROOT_DIR" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# +__initialize_database +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Updating config files __update_conf_files +# - - - - - - - - - - - - - - - - - - - - - - - - - +# run the pre execute commands __pre_execute +# - - - - - - - - - - - - - - - - - - - - - - - - - +# Set permissions __fix_permissions "$SERVICE_USER" "$SERVICE_GROUP" +# - - - - - - - - - - - - - - - - - - - - - - - - - +# __run_pre_execute_checks 2>/dev/stderr | tee -a -p "/data/logs/entrypoint.log" "/data/logs/init.txt" || return 20 +# - - - - - - - - - - - - - - - - - - - - - - - - - __run_start_script 2>>/dev/stderr | tee -p -a "/data/logs/entrypoint.log" errorCode=$? if [ -n "$EXEC_CMD_BIN" ]; then - if [ "$errorCode" -eq 0 ]; then SERVICE_EXIT_CODE=0; SERVICE_IS_RUNNING="yes"; else SERVICE_EXIT_CODE=$errorCode; SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"; [ -s "$SERVICE_PID_FILE" ] || rm -Rf "$SERVICE_PID_FILE"; fi - SERVICE_EXIT_CODE=0 + if [ "$errorCode" -eq 0 ]; then + SERVICE_EXIT_CODE=0 + SERVICE_IS_RUNNING="yes" + else + SERVICE_EXIT_CODE=$errorCode + SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}" + if [ ! -s "$SERVICE_PID_FILE" ]; then + rm -Rf "$SERVICE_PID_FILE" + fi + fi + SERVICE_EXIT_CODE=0 fi +# - - - - - - - - - - - - - - - - - - - - - - - - - +# start the post execute function in background __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" & -__banner "Initializing of $SERVICE_NAME has completed with statusCode: $SERVICE_EXIT_CODE" | tee -p -a "/data/logs/entrypoint.log" "/data/logs/init.txt" +# - - - - - - - - - - - - - - - - - - - - - - - - - __script_exit $SERVICE_EXIT_CODE