diff --git a/.env.scripts b/.env.scripts index bce7fc9..0c22901 100644 --- a/.env.scripts +++ b/.env.scripts @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605311110-git +##@Version : 202607271317-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 31 11:10:17 AM EDT 2026 +# @@Created : Mon Jul 27 01:17:20 PM EDT 2026 # @@File : .env.scripts # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript @@ -54,7 +54,7 @@ ENV_ADD_IMAGE_PUSH="" # - - - - - - - - - - - - - - - - - - - - - - - - - # Pull Configuration # ENV_PULL_URL: Source image to pull from (base image) -ENV_PULL_URL="casjaysdev/alpine" +ENV_PULL_URL="alpine" # ENV_DISTRO_TAG: Tag for the pull source image ENV_DISTRO_TAG="${IMAGE_VERSION}" # - - - - - - - - - - - - - - - - - - - - - - - - - @@ -72,12 +72,8 @@ NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories WWW_ROOT_DIR="/usr/local/share/httpd/default" -DEFAULT_FILE_DIR="/usr/local/share/template-files" -DEFAULT_DATA_DIR="/usr/local/share/template-files/data" -DEFAULT_CONF_DIR="/usr/local/share/template-files/config" -DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - -ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates" +ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates" # - - - - - - - - - - - - - - - - - - - - - - - - - # ex: ts=2 sw=2 et filetype=sh # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Dockerfile b/Dockerfile index 14d63d3..0e1f0ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,10 +6,6 @@ ARG BUILD_DATE="202605311109" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG WWW_ROOT_DIR="/usr/local/share/httpd/default" -ARG DEFAULT_FILE_DIR="/usr/local/share/template-files" -ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data" -ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config" -ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ARG USER="root" @@ -170,10 +166,6 @@ ARG EXPOSE_PORTS ARG BUILD_VERSION ARG IMAGE_VERSION ARG WWW_ROOT_DIR -ARG DEFAULT_FILE_DIR -ARG DEFAULT_DATA_DIR -ARG DEFAULT_CONF_DIR -ARG DEFAULT_TEMPLATE_DIR ARG DISTRO_VERSION ARG NODE_VERSION ARG NODE_MANAGER @@ -183,7 +175,7 @@ ARG SHELL_OPTS ARG PATH ARG TARGETARCH -ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " +ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -214,7 +206,7 @@ COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu RUN echo "Initializing the system"; \ $SHELL_OPTS; \ - mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \ + mkdir -p "/root/docker/setup" "/etc/profile.d"; \ if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \ echo "" @@ -332,10 +324,6 @@ ARG BUILD_VERSION ARG IMAGE_VERSION ARG GIT_COMMIT ARG WWW_ROOT_DIR -ARG DEFAULT_FILE_DIR -ARG DEFAULT_DATA_DIR -ARG DEFAULT_CONF_DIR -ARG DEFAULT_TEMPLATE_DIR ARG DISTRO_VERSION ARG NODE_VERSION ARG NODE_MANAGER @@ -357,10 +345,10 @@ LABEL org.opencontainers.image.authors="${LICENSE}" LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/rust" +LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/rust" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.revision="${GIT_COMMIT}" -LABEL org.opencontainers.image.source="https://github.com/dockersrc/rust" +LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/rust" LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/rust" LABEL com.github.containers.toolbox="false" diff --git a/rootfs/root/docker/setup/00-init.sh b/rootfs/root/docker/setup/00-init.sh index 4d5bbdc..d3935e5 100755 --- a/rootfs/root/docker/setup/00-init.sh +++ b/rootfs/root/docker/setup/00-init.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605311104-git +##@Version : 202607271318-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 31 11:04:48 AM EDT 2026 +# @@Created : Mon Jul 27 01:18:35 PM EDT 2026 # @@File : 00-init.sh # @@Description : script to run init # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables @@ -28,9 +28,7 @@ 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 diff --git a/rootfs/root/docker/setup/01-system.sh b/rootfs/root/docker/setup/01-system.sh index ea08c06..c73a7d3 100755 --- a/rootfs/root/docker/setup/01-system.sh +++ b/rootfs/root/docker/setup/01-system.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605311104-git +##@Version : 202607271318-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 31 11:04:49 AM EDT 2026 +# @@Created : Mon Jul 27 01:18:35 PM EDT 2026 # @@File : 01-system.sh # @@Description : script to run system # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables diff --git a/rootfs/root/docker/setup/02-packages.sh b/rootfs/root/docker/setup/02-packages.sh index d3f8b7e..f6b8104 100755 --- a/rootfs/root/docker/setup/02-packages.sh +++ b/rootfs/root/docker/setup/02-packages.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605311104-git +##@Version : 202607271318-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 31 11:04:49 AM EDT 2026 +# @@Created : Mon Jul 27 01:18:35 PM EDT 2026 # @@File : 02-packages.sh # @@Description : script to run packages # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables diff --git a/rootfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh index 7dde952..9c2f171 100755 --- a/rootfs/root/docker/setup/03-files.sh +++ b/rootfs/root/docker/setup/03-files.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605311104-git +##@Version : 202607271318-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 31 11:04:49 AM EDT 2026 +# @@Created : Mon Jul 27 01:18:35 PM EDT 2026 # @@File : 03-files.sh # @@Description : script to run files # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables @@ -61,29 +61,23 @@ if [ -d "/tmp/etc" ]; then if [ -d "$config" ]; then mkdir -p "/etc/$name" cp -Rf "$config/." "/etc/$name/" - mkdir -p "/usr/local/share/template-files/config/$name" - cp -Rf "$config/." "/usr/local/share/template-files/config/$name/" else cp -Rf "$config" "/etc/$name" - cp -Rf "$config" "/usr/local/share/template-files/config/$name" fi done fi unset config -if [ -d "/tmp/data" ]; then - for data in "/tmp/data"/*; do - [ -e "$data" ] || continue - name="${data##*/}" - echo "Installing $data to /usr/local/share/template-files/data" - if [ -d "$data" ]; then - mkdir -p "/usr/local/share/template-files/data/$name" - cp -Rf "$data/." "/usr/local/share/template-files/data/$name/" - else - cp -Rf "$data" "/usr/local/share/template-files/data/$name" - fi +if [ -d "/tmp/usr" ]; then + for share in "/tmp/usr"/*; do + [ -e "$share" ] || continue + name="${share##*/}" + dest="/usr/$name" + echo "Installing $share to $dest" + mkdir -p "$dest" + cp -Rf "$share/." "$dest/" done fi -unset data +unset share # - - - - - - - - - - - - - - - - - - - - - - - - - # Main script diff --git a/rootfs/root/docker/setup/04-users.sh b/rootfs/root/docker/setup/04-users.sh index 4868589..4a38b64 100755 --- a/rootfs/root/docker/setup/04-users.sh +++ b/rootfs/root/docker/setup/04-users.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605311104-git +##@Version : 202607271318-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 31 11:04:49 AM EDT 2026 +# @@Created : Mon Jul 27 01:18:35 PM EDT 2026 # @@File : 04-users.sh # @@Description : script to run users # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables diff --git a/rootfs/root/docker/setup/06-post.sh b/rootfs/root/docker/setup/06-post.sh index 007addf..4b92a3f 100755 --- a/rootfs/root/docker/setup/06-post.sh +++ b/rootfs/root/docker/setup/06-post.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605311104-git +##@Version : 202607271318-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 31 11:04:51 AM EDT 2026 +# @@Created : Mon Jul 27 01:18:36 PM EDT 2026 # @@File : 06-post.sh # @@Description : script to run post # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Set env variables diff --git a/rootfs/root/docker/setup/07-cleanup.sh b/rootfs/root/docker/setup/07-cleanup.sh index d503843..301e34c 100755 --- a/rootfs/root/docker/setup/07-cleanup.sh +++ b/rootfs/root/docker/setup/07-cleanup.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605311104-git +##@Version : 202607271318-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT +# @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Sun May 31 11:04:52 AM EDT 2026 +# @@Created : Mon Jul 27 01:18:36 PM EDT 2026 # @@File : 07-cleanup.sh # @@Description : script to run cleanup # @@Changelog : newScript @@ -20,7 +20,7 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options -set -o pipefail +set -eo pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS # - - - - - - - - - - - - - - - - - - - - - - - - - # Load functions diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh index c3cb355..95762bc 100755 --- a/rootfs/usr/local/bin/entrypoint.sh +++ b/rootfs/usr/local/bin/entrypoint.sh @@ -1,15 +1,15 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202606261500-git +##@Version : 202607082023-git # @@Author : Jason Hempstead # @@Contact : jason@casjaysdev.pro # @@License : WTFPL # @@ReadME : entrypoint.sh --help # @@Copyright : Copyright: (c) 2026 Jason Hempstead, Casjays Developments -# @@Created : Friday, Jun 05, 2026 18:22 EDT +# @@Created : Monday, Jul 27, 2026 13:18 EDT # @@File : entrypoint.sh -# @@Description : Entrypoint file for alpine +# @@Description : Entrypoint file for rust # @@Changelog : New script # @@TODO : Better documentation # @@Other : @@ -39,7 +39,7 @@ PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin" # - - - - - - - - - - - - - - - - - - - - - - - - - # Set bash options SCRIPT_FILE="$0" -CONTAINER_NAME="alpine" +CONTAINER_NAME="rust" SCRIPT_NAME="${SCRIPT_FILE##*/}" CONTAINER_NAME="${ENV_CONTAINER_NAME:-$CONTAINER_NAME}" # - - - - - - - - - - - - - - - - - - - - - - - - - @@ -95,8 +95,8 @@ SERVICE_UID="${SERVICE_UID:-0}" SERVICE_GID="${SERVICE_GID:-0}" # - - - - - - - - - - - - - - - - - - - - - - - - - # User and group in which the service switches to - IE: nginx,apache,mysql,postgres -#SERVICE_USER="${SERVICE_USER:-alpine}" # execute command as another user -#SERVICE_GROUP="${SERVICE_GROUP:-alpine}" # Set the service group +#SERVICE_USER="${SERVICE_USER:-rust}" # execute command as another user +#SERVICE_GROUP="${SERVICE_GROUP:-rust}" # Set the service group # - - - - - - - - - - - - - - - - - - - - - - - - - # Secondary ports # specifiy other ports @@ -123,7 +123,7 @@ export PATH RUNAS_USER SERVICE_USER SERVICE_GROUP SERVICE_UID SERVICE_GID WWW_RO # show message __run_message() { - return + return 0 } # - - - - - - - - - - - - - - - - - - - - - - - - - ################## END OF CONFIGURATION ##################### @@ -291,7 +291,7 @@ fi if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then if [ "$CONFIG_DIR_INITIALIZED" = "no" ] || [ "$DATA_DIR_INITIALIZED" = "no" ]; then if [ "$ENTRYPOINT_MESSAGE" = "yes" ]; then - echo "Executing entrypoint script for alpine" + echo "Executing entrypoint script for rust" fi fi # - - - - - - - - - - - - - - - - - - - - - - - - - @@ -370,7 +370,7 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then # - - - - - - - - - - - - - - - - - - - - - - - - - # import hosts file into container if [ -f "/usr/local/etc/hosts" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ]; then - grep -vF "$HOSTNAME" "/usr/local/etc/hosts" 2>/dev/null >>"/etc/hosts" || true + grep -vF -- "$HOSTNAME" "/usr/local/etc/hosts" 2>/dev/null >>"/etc/hosts" || true fi # - - - - - - - - - - - - - - - - - - - - - - - - - # import resolv.conf file into container @@ -422,7 +422,7 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ] || [ "$CONFIG_DIR_INITIALIZED" = "no" ] | echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_INIT_FILE" 2>/dev/null || true fi # - - - - - - - - - - - - - - - - - - - - - - - - - - # setup the smtp server — non-fatal; this image does not use ssmtp + # setup the smtp server __setup_mta || true # - - - - - - - - - - - - - - - - - - - - - - - - - ENTRYPOINT_FIRST_RUN="no" @@ -576,7 +576,7 @@ healthcheck) services+="$name " done fi - services="$(printf '%s\n' $services | sort -u | grep -v '^$')" + services="$(printf '%s\n' $services | sort -u | grep -v -- '^$')" for proc in $services; do if [ -n "$proc" ]; then if ! __pgrep "$proc"; then @@ -587,7 +587,7 @@ healthcheck) done for port in $healthPorts; do if command -v netstat &>/dev/null && [ -n "$port" ]; then - if ! netstat -taupln | grep -q ":$port "; then + if ! netstat -taupln | grep -q -- ":$port "; then echo "$port isn't open" >&2 healthStatus=$((healthStatus + 1)) fi @@ -617,20 +617,24 @@ ports) # show running processes procs) shift 1 - ps="$(__ps axco command 2>/dev/null | grep -vE '^(COMMAND|grep|ps)$' | sort -u)" + ps="$(__ps axco command 2>/dev/null | grep -vE -- '^(COMMAND|grep|ps)$' | sort -u)" [ -n "$ps" ] && printf '%s\n%s\n' "Found the following processes" "$ps" | tr '\n' ' ' exit $? ;; # Launch shell */bin/sh | */bin/bash | bash | sh | shell) shift 1 - __exec_command "${@:-/bin/bash -l}" + __exec_command "$@" exit $? ;; # execute commands exec) shift 1 - __exec_command "${@:-echo "No commands given"}" + if [ $# -eq 0 ]; then + echo "No command given to exec" >&2 + exit 1 + fi + __exec_command "$@" exit $? ;; # show/start init scripts diff --git a/rootfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh index c917d98..5d25d12 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 : 202606261430-git +##@Version : 202607082330-git # @@Author : Jason Hempstead # @@Contact : git-admin@casjaysdev.pro # @@License : LICENSE.md @@ -93,7 +93,11 @@ __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) + if [ -n "$2" ]; then + result=$(find "$1" -mindepth 1 -type "$2" 2>/dev/null) + else + result=$(find "$1" -mindepth 1 \( -type f -o -type d \) 2>/dev/null) + fi [ -n "$result" ] || return 10 printf '%s\n' "$result" } @@ -371,17 +375,23 @@ __init_working_dir() { # - - - - - - - - - - - - - - - - - - - - - - - - - __exec_service() { local count=6 + local bgpid [ "$DEBUGGER" = "on" ] && echo "Starting $1" - eval "$@" 2>>/dev/stderr >>/data/logs/start.log & + eval "$@" & + bgpid=$! while [ $count -ne 0 ]; do sleep 3 + if ! kill -0 "$bgpid" 2>/dev/null; then + wait "$bgpid" + return $? + fi if __pgrep "$1"; then touch "/run/init.d/$1.pid" - break - else - count=$((count - 1)) + return 0 fi + count=$((count - 1)) done + return 1 } # - - - - - - - - - - - - - - - - - - - - - - - - - __update_ssl_certs() { @@ -791,26 +801,24 @@ __proc_check() { # - - - - - - - - - - - - - - - - - - - - - - - - - __set_user_group_id() { - local exitStatus=0 local set_user="${1:-$SERVICE_USER}" local set_uid="${2:-${SERVICE_UID:-1000}}" local set_gid="${3:-${SERVICE_GID:-1000}}" - local random_id="$(__generate_random_uids)" - set_uid="$(__get_uid "$set_user" || echo "$set_uid")" - set_gid="$(__get_gid "$set_user" || echo "$set_gid")" - if ! grep -shq "^$set_user:" "/etc/passwd" "/etc/group"; then - return 0 - fi + # Nothing to do for root or unset if [ -z "$set_user" ] || [ "$set_user" = "root" ]; then return 0 fi - if grep -shq "^$set_user:" "/etc/passwd" "/etc/group"; then - if __check_for_guid "$set_gid"; then - groupmod -g "${set_gid}" $set_user 2>/dev/stderr | tee -p -a "/data/logs/init.txt" >/dev/null - fi - if __check_for_uid "$set_uid"; then - usermod -u "${set_uid}" -g "${set_gid}" $set_user 2>/dev/stderr | tee -p -a "/data/logs/init.txt" >/dev/null - fi + # Nothing to do if the user does not exist yet + if ! grep -shq "^$set_user:" "/etc/passwd" "/etc/group"; then + return 0 + fi + set_uid="$(__get_uid "$set_user" || echo "$set_uid")" + set_gid="$(__get_gid "$set_user" || echo "$set_gid")" + if __check_for_guid "$set_gid"; then + groupmod -g "${set_gid}" "$set_user" 2>/dev/stderr | tee -a "/data/logs/init.txt" >/dev/null + fi + if __check_for_uid "$set_uid"; then + usermod -u "${set_uid}" -g "${set_gid}" "$set_user" 2>/dev/stderr | tee -a "/data/logs/init.txt" >/dev/null fi export SERVICE_UID="$set_uid" export SERVICE_GID="$set_gid" @@ -826,15 +834,14 @@ __create_service_user() { local create_uid="${4:-${SERVICE_UID:-$USER_UID}}" local create_gid="${5:-${SERVICE_GID:-$USER_GID}}" local random_id="$(__generate_random_uids)" - local create_home_dir="${create_home_dir:-/home/$create_user}" local log_file="/data/logs/init.txt" - # Ensure log directory exists - [ -d "$(dirname "$log_file")" ] || mkdir -p "$(dirname "$log_file")" 2>/dev/null - # Validate that we have at least a user or group to create - if [ -z "$create_user" ] && [ -z "$create_group" ]; then - echo "No user or group specified to create" >&2 + # Nothing to do for unset or root user — return silently + create_home_dir="${create_home_dir:-/home/$create_user}" + if [ -z "$create_user" ] || [ "$create_user" = "root" ]; then return 0 fi + # Ensure log directory exists + [ -d "$(dirname "$log_file")" ] || mkdir -p "$(dirname "$log_file")" 2>/dev/null # Validate user/group name format (alphanumeric, underscore, hyphen; must start with letter or underscore) 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 @@ -848,10 +855,6 @@ __create_service_user() { if grep -shq "^$create_user:" "/etc/passwd" && grep -shq "^$create_group:" "/etc/group"; then return 0 fi - # Root user/group - nothing to create - if [ "$create_user" = "root" ] && [ "$create_group" = "root" ]; then - return 0 - fi # Override with RUNAS_USER if specified and not root if [ -n "$RUNAS_USER" ] && [ "$RUNAS_USER" != "root" ]; then create_user="$RUNAS_USER" @@ -968,7 +971,6 @@ __create_env_file() { } # - - - - - - - - - - - - - - - - - - - - - - - - - __exec_command() { - local exitCode=0 if [ $# -eq 0 ]; then exec bash -l fi @@ -1071,7 +1073,7 @@ __start_init_scripts() { __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=$(<"$expected_pid_file") 2>/dev/null + file_pid=$(cat "$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)" @@ -1122,16 +1124,65 @@ __start_init_scripts() { __setup_mta() { # Check for an installed MTA binary — directories alone cannot be trusted because # /etc/postfix ships in some base images (casjaysdev/alpine) even without postfix. - command -v ssmtp &>/dev/null || command -v postfix &>/dev/null || return 0 + command -v msmtp &>/dev/null || command -v ssmtp &>/dev/null || command -v postfix &>/dev/null || return 0 local exitCode=0 - local relay_port="${EMAIL_RELAY//*:/}" - local relay_server="${EMAIL_RELAY//:*/}" + # Extract server and port only when EMAIL_RELAY contains a colon + local relay_server="" relay_port="" + if [[ "$EMAIL_RELAY" == *:* ]]; then + relay_server="${EMAIL_RELAY%%:*}" + relay_port="${EMAIL_RELAY##*:}" + else + relay_server="$EMAIL_RELAY" + fi local local_hostname="${FULL_DOMAIN_NAME:-}" local account_user="${SERVER_ADMIN//@*/}" local account_domain="${EMAIL_DOMAIN//*@/}" - [[ $EMAIL_RELAY == *[0-9][0-9]* ]] || relay_port="465" + # Default to port 25 — plain SMTP, no cert validation required + relay_port="${relay_port:-25}" + # Autodetect Docker host gateway as SMTP relay when EMAIL_RELAY is unset + if [ -z "$EMAIL_RELAY" ] && timeout 2 bash -c 'echo >/dev/tcp/172.17.0.1/25' 2>/dev/null; then + relay_server="172.17.0.1" + relay_port="25" + fi + # Port 25 is plain SMTP — no TLS; anything else defaults to TLS on + local relay_use_tls="Yes" + local relay_smtp_tls="yes" + [ "$relay_port" = "25" ] && relay_use_tls="No" && relay_smtp_tls="no" + ################# msmtp relay setup + if command -v msmtp &>/dev/null; then + [ -d "/config/msmtp" ] || mkdir -p "/config/msmtp" + [ -f "/etc/msmtprc" ] && __rm "/etc/msmtprc" + if [ ! -f "/config/msmtp/msmtprc" ]; then + cat >"/config/msmtp/msmtprc" </dev/null || true + # sendmail compat symlink + if [ ! -e "/usr/sbin/sendmail" ] && command -v msmtp &>/dev/null; then + __symlink "$(command -v msmtp)" "/usr/sbin/sendmail" + fi + [ "$DEBUGGER" = "on" ] && echo "Done setting up msmtp" + fi + ################# sSMTP relay setup - if command -v ssmtp &>/dev/null; then + elif 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")" @@ -1143,7 +1194,7 @@ mailhub=${relay_server:-172.17.0.1}:$relay_port rewriteDomain=$local_hostname hostname=$local_hostname TLS_CA_FILE=/etc/ssl/certs/ca-certificates.crt -UseTLS=Yes +UseTLS=${relay_use_tls} UseSTARTTLS=No AuthMethod=LOGIN FromLineOverride=yes @@ -1191,7 +1242,7 @@ transport_maps = hash:/etc/postfix/transport virtual_alias_maps = hash:/etc/postfix/virtual relay_domains = hash:/etc/postfix/mydomains, regexp:/etc/postfix/mydomains.pcre tls_random_source = dev:/dev/urandom -smtp_use_tls = yes +smtp_use_tls = ${relay_smtp_tls} smtpd_use_tls = yes smtpd_tls_session_cache_database = btree:/etc/postfix/smtpd_scache smtpd_tls_exclude_ciphers = aNULL, eNULL, EXPORT, DES, RC4, MD5, PSK, aECDH, EDH-DSS-DES-CBC3-SHA, EDH-RSA-DES-CBC3-SHA, KRB5-DES, CBC3-SHA @@ -1432,16 +1483,18 @@ __initialize_ssl_certs() { } # - - - - - - - - - - - - - - - - - - - - - - - - - __start_php_dev_server() { - if [ "$2" = "yes" ]; then - if [ -d "/usr/local/share/httpd" ]; then - 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 [[ "$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 + [ "$2" = "yes" ] || return 0 + local docroot="" + # Prefer a custom doc root when it differs from the default share path + if [ -n "$1" ] && [[ "$1" != "/usr/local/share/httpd"* ]]; then + docroot="$1" + elif [ -d "/usr/local/share/httpd" ]; then + docroot="/usr/local/share/httpd" fi + [ -n "$docroot" ] || return 0 + find "$docroot" -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 "$docroot" } # - - - - - - - - - - - - - - - - - - - - - - - - - __check_service() { @@ -1484,7 +1537,7 @@ __switch_to_user() { # - - - - - - - - - - - - - - - - - - - - - - - - - # usage backup "days" "hours" __backup() { - local dirs="" backup_dir backup_name backup_exclude runTime cronTime maxDays + local dirs=() backup_dir backup_name backup_exclude runTime cronTime maxDays if test -n "$1" && test -z "${1//[0-9]/}"; then maxDays="$1" shift 1 @@ -1506,11 +1559,11 @@ __backup() { backup_dir="$BACKUP_DIR/$(date +'%y/%m')" backup_name="$(date +'%d_%H-%M').tar.gz" backup_exclude="/data/logs $BACKUP_DIR $BACK_EXCLUDE_DIR" - [ -d "/data" ] && dirs+="/data " - [ -d "/config" ] && dirs+="/config " + [ -d "/data" ] && dirs+=("/data") + [ -d "/config" ] && dirs+=("/config") [ -d "$logDir" ] || mkdir -p "$logDir" [ -d "$backup_dir" ] || mkdir -p "$backup_dir" - [ -z "$dirs" ] && echo "BACKUP_DIR is unset" >&2 && return 1 + [ "${#dirs[@]}" -eq 0 ] && echo "BACKUP_DIR is unset" >&2 && return 1 [ -f "$pidFile" ] && echo "A backup job is already running" >&2 && return 1 echo "$$" >"$pidFile" trap "rm -f '$pidFile'" EXIT INT TERM @@ -1519,7 +1572,7 @@ __backup() { for excl in $backup_exclude; do tar_excludes+=("--exclude=$excl") done - tar "${tar_excludes[@]}" -cfvz "$backup_dir/$backup_name" $dirs 2>/dev/stderr >>"$logDir/$CONTAINER_NAME" || exitCodeP=1 + tar "${tar_excludes[@]}" -cfvz "$backup_dir/$backup_name" "${dirs[@]}" 2>/dev/stderr >>"$logDir/$CONTAINER_NAME" || exitCodeP=1 if [ $exitCodeP -eq 0 ]; then echo "Backup has completed and saved to: $backup_dir/$backup_name" printf '%s\n\n' "Backup has completed on $(date)" >>"$logDir/$CONTAINER_NAME" @@ -1536,7 +1589,11 @@ __backup() { else return $exitStatus fi - sleep $runTime && __backup "$maxDays" "$cronTime" + # Loop instead of recurse — recursion adds a stack frame every interval + while true; do + sleep "$runTime" + __backup "$maxDays" + done } # - - - - - - - - - - - - - - - - - - - - - - - - - # set variables from function calls