diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh index 99cbe7f..67b9d67 100755 --- a/rootfs/usr/local/bin/entrypoint.sh +++ b/rootfs/usr/local/bin/entrypoint.sh @@ -1,21 +1,21 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202511291153-git -# @@Author : Jason Hempstead -# @@Contact : jason@casjaysdev.pro -# @@License : WTFPL +##@Version : 202511301200-git +# @@Author : GEN_SCRIPT_REPLACE_AUTHOR +# @@Contact : GEN_SCRIPT_REPLACE_EMAIL +# @@License : GEN_SCRIPT_REPLACE_LICENSE # @@ReadME : entrypoint.sh --help -# @@Copyright : Copyright: (c) 2025 Jason Hempstead, Casjays Developments -# @@Created : Saturday, Nov 29, 2025 11:53 EST +# @@Copyright : GEN_SCRIPT_REPLACE_COPYRIGHT +# @@Created : GEN_SCRIPT_REPLACE_DATE # @@File : entrypoint.sh -# @@Description : Entrypoint file for alpine -# @@Changelog : New script -# @@TODO : Better documentation -# @@Other : -# @@Resource : -# @@Terminal App : no -# @@sudo/root : no +# @@Description : Entrypoint file for GEN_SCRIPT_REPLACE_APPNAME +# @@Changelog : GEN_SCRIPT_REPLACE_CHANGELOG +# @@TODO : GEN_SCRIPT_REPLACE_TODO +# @@Other : GEN_SCRIPT_REPLACE_OTHER +# @@Resource : GEN_SCRIPT_REPLACE_RES +# @@Terminal App : GEN_SCRIPT_REPLACE_TERMINAL +# @@sudo/root : GEN_SCRIPT_REPLACE_SUDO # @@Template : other/docker-entrypoint # - - - - - - - - - - - - - - - - - - - - - - - - - # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 @@ -24,19 +24,35 @@ trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' INT TERM PWR # - - - - - - - - - - - - - - - - - - - - - - - - - # 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:-}" -{ [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; } && echo "Enabling debugging" && set -o pipefail -x$DEBUGGER_OPTIONS && export DEBUGGER="on" || set -o pipefail +if [ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ]; then + export DEBUGGER_OPTIONS="$(<"/config/.debug")" +else + DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}" +fi +if [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; then + echo "Enabling debugging" + set -o pipefail -x$DEBUGGER_OPTIONS + export DEBUGGER="on" +else + set -o pipefail +fi # - - - - - - - - - - - - - - - - - - - - - - - - - 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="GEN_SCRIPT_REPLACE_APPNAME" SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)" CONTAINER_NAME="${ENV_CONTAINER_NAME:-$CONTAINER_NAME}" # - - - - - - - - - - - - - - - - - - - - - - - - - # remove whitespaces from beginning argument -while :; do [ "$1" = " " ] && shift 1 || break; done +while :; do + if [ "$1" = " " ]; then + shift 1 + else + break + fi +done # - - - - - - - - - - - - - - - - - - - - - - - - - [ "$1" = "$SCRIPT_FILE" ] && shift 1 [ "$1" = "$SCRIPT_NAME" ] && shift 1 @@ -73,30 +89,38 @@ done unset set_env # - - - - - - - - - - - - - - - - - - - - - - - - - # User to use to launch service - IE: postgres -RUNAS_USER="root" # normally root +# normally root +RUNAS_USER="root" # - - - - - - - - - - - - - - - - - - - - - - - - - # Set user and group from env SERVICE_USER="${PUID:-$SERVICE_USER}" SERVICE_GROUP="${PGID:-$SERVICE_GROUP}" # - - - - - - - - - - - - - - - - - - - - - - - - - # Set user and group ID -SERVICE_UID="${SERVICE_UID:-0}" # set the user id -SERVICE_GID="${SERVICE_GID:-0}" # set the group id +# set the user id +SERVICE_UID="${SERVICE_UID:-0}" +# set the group id +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:-GEN_SCRIPT_REPLACE_APPNAME}" # execute command as another user +#SERVICE_GROUP="${SERVICE_GROUP:-GEN_SCRIPT_REPLACE_APPNAME}" # Set the service group # - - - - - - - - - - - - - - - - - - - - - - - - - # Secondary ports -SERVER_PORTS="" # specifiy other ports +# specifiy other ports +SERVER_PORTS="" # - - - - - - - - - - - - - - - - - - - - - - - - - # Primary server port- will be added to server ports -WEB_SERVER_PORT="" # port : 80,443 +# port : 80,443 +WEB_SERVER_PORT="" # - - - - - - - - - - - - - - - - - - - - - - - - - # Healthcheck variables -HEALTH_ENABLED="yes" # enable healthcheck [yes/no] -SERVICES_LIST="tini" # comma separated list of processes for the healthcheck -HEALTH_ENDPOINTS="" # url endpoints: [http://localhost/health,http://localhost/test] +# enable healthcheck [yes/no] +HEALTH_ENABLED="yes" +# comma separated list of processes for the healthcheck +SERVICES_LIST="tini" +# url endpoints: [http://localhost/health,http://localhost/test] +HEALTH_ENDPOINTS="" # - - - - - - - - - - - - - - - - - - - - - - - - - # Update path var export PATH RUNAS_USER SERVICE_USER SERVICE_GROUP SERVICE_UID SERVICE_GID WWW_ROOT_DIR DATABASE_DIR @@ -163,12 +187,12 @@ export ENTRYPOINT_CONFIG_INIT_FILE="${ENTRYPOINT_CONFIG_INIT_FILE:-/config/.dock # - - - - - - - - - - - - - - - - - - - - - - - - - if [ -n "$CONTAINER_WEB_SERVER_WWW_REPO" ]; then www_temp_dir="/tmp/git/$(basename -- "$CONTAINER_WEB_SERVER_WWW_REPO")" - rm -Rf "${WWW_ROOT_DIR:?}"/* "${www_temp_dir:?}"/* - mkdir -p "$WWW_ROOT_DIR" "$www_temp_dir" - git clone -q "$CONTAINER_WEB_SERVER_WWW_REPO" "$www_temp_dir" 2>/dev/null - rm -Rf "$www_temp_dir/.git" "$www_temp_dir"/.git* - rsync -ra "$www_temp_dir/" "$WWW_ROOT_DIR" --delete >/dev/null 2>&1 - rm -Rf "$www_temp_dir" + rm -Rf "${WWW_ROOT_DIR:?}"/* "${www_temp_dir:?}"/* 2>/dev/null || true + mkdir -p "$WWW_ROOT_DIR" "$www_temp_dir" 2>/dev/null || true + git clone -q "$CONTAINER_WEB_SERVER_WWW_REPO" "$www_temp_dir" 2>/dev/null || true + rm -Rf "$www_temp_dir/.git" "$www_temp_dir"/.git* 2>/dev/null || true + rsync -ra "$www_temp_dir/" "$WWW_ROOT_DIR" --delete 2>/dev/null || true + rm -Rf "$www_temp_dir" 2>/dev/null || true fi # - - - - - - - - - - - - - - - - - - - - - - - - - # variables based on env/files @@ -181,9 +205,21 @@ fi # - - - - - - - - - - - - - - - - - - - - - - - - - # is already Initialized -[ -f "$ENTRYPOINT_DATA_INIT_FILE" ] && DATA_DIR_INITIALIZED="yes" || DATA_DIR_INITIALIZED="no" -[ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ] && CONFIG_DIR_INITIALIZED="yes" || CONFIG_DIR_INITIALIZED="no" -{ [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; } && ENTRYPOINT_FIRST_RUN="no" || ENTRYPOINT_FIRST_RUN="yes" +if [ -f "$ENTRYPOINT_DATA_INIT_FILE" ]; then + DATA_DIR_INITIALIZED="yes" +else + DATA_DIR_INITIALIZED="no" +fi +if [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ]; then + CONFIG_DIR_INITIALIZED="yes" +else + CONFIG_DIR_INITIALIZED="no" +fi +if [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; then + ENTRYPOINT_FIRST_RUN="no" +else + ENTRYPOINT_FIRST_RUN="yes" +fi # - - - - - - - - - - - - - - - - - - - - - - - - - # clean ENV_PORTS variables ENV_PORTS="${ENV_PORTS//,/ }" # @@ -207,115 +243,172 @@ ENV_PORTS="$(__format_variables "$SERVER_PORTS" "$WEB_SERVER_PORTS" "$ENV_PORTS" HEALTH_ENDPOINTS="${HEALTH_ENDPOINTS//,/ }" # - - - - - - - - - - - - - - - - - - - - - - - - - # create required directories -mkdir -p "/run" -mkdir -p "/tmp" -mkdir -p "/root" -mkdir -p "/var/run" -mkdir -p "/var/tmp" -mkdir -p "/run/cron" -mkdir -p "/data/logs" -mkdir -p "/run/init.d" -mkdir -p "/config/enable" -mkdir -p "/config/secure" -mkdir -p "/usr/local/etc/docker/exec" +mkdir -p "/run" 2>/dev/null || true +mkdir -p "/tmp" 2>/dev/null || true +mkdir -p "/root" 2>/dev/null || true +mkdir -p "/var/run" 2>/dev/null || true +mkdir -p "/var/tmp" 2>/dev/null || true +mkdir -p "/run/cron" 2>/dev/null || true +mkdir -p "/data/logs" 2>/dev/null || true +mkdir -p "/run/init.d" 2>/dev/null || true +mkdir -p "/config/enable" 2>/dev/null || true +mkdir -p "/config/secure" 2>/dev/null || true +mkdir -p "/usr/local/etc/docker/exec" 2>/dev/null || true # - - - - - - - - - - - - - - - - - - - - - - - - - # create required files -touch "/data/logs/start.log" -touch "/data/logs/entrypoint.log" +touch "/data/logs/start.log" 2>/dev/null || true +touch "/data/logs/entrypoint.log" 2>/dev/null || true # - - - - - - - - - - - - - - - - - - - - - - - - - # fix permissions -chmod -f 777 "/run" -chmod -f 777 "/tmp" -chmod -f 700 "/root" -chmod -f 777 "/var/run" -chmod -f 777 "/var/tmp" -chmod -f 777 "/run/cron" -chmod -f 777 "/data/logs" -chmod -f 777 "/run/init.d" -chmod -f 777 "/config/enable" -chmod -f 777 "/config/secure" -chmod -f 777 "/data/logs/entrypoint.log" -chmod -f 777 "/usr/local/etc/docker/exec" +chmod -f 777 "/run" 2>/dev/null || true +chmod -f 777 "/tmp" 2>/dev/null || true +chmod -f 700 "/root" 2>/dev/null || true +chmod -f 777 "/var/run" 2>/dev/null || true +chmod -f 777 "/var/tmp" 2>/dev/null || true +chmod -f 777 "/run/cron" 2>/dev/null || true +chmod -f 777 "/data/logs" 2>/dev/null || true +chmod -f 777 "/run/init.d" 2>/dev/null || true +chmod -f 777 "/config/enable" 2>/dev/null || true +chmod -f 777 "/config/secure" 2>/dev/null || true +chmod -f 777 "/data/logs/entrypoint.log" 2>/dev/null || true +chmod -f 777 "/usr/local/etc/docker/exec" 2>/dev/null || true # - - - - - - - - - - - - - - - - - - - - - - - - - # lets ensure everyone can write to std* -[ -f "/dev/stdin" ] && chmod -f 777 "/dev/stdin" -[ -f "/dev/stderr" ] && chmod -f 777 "/dev/stderr" -[ -f "/dev/stdout" ] && chmod -f 777 "/dev/stdout" +if [ -f "/dev/stdin" ]; then + chmod -f 777 "/dev/stdin" 2>/dev/null || true +fi +if [ -f "/dev/stderr" ]; then + chmod -f 777 "/dev/stderr" 2>/dev/null || true +fi +if [ -f "/dev/stdout" ]; then + chmod -f 777 "/dev/stdout" 2>/dev/null || true +fi # - - - - - - - - - - - - - - - - - - - - - - - - - -cat </dev/null +cat </dev/null | tee /etc/profile.d/locales.shadow /etc/profile.d/locales.sh >/dev/null 2>&1 || true export LANG="\${LANG:-C.UTF-8}" export LC_ALL="\${LANG:-C.UTF-8}" export TZ="\${TZ:-\${TIMEZONE:-America/New_York}}" EOF # - - - - - - - - - - - - - - - - - - - - - - - - - # Create the backup dir -[ -n "$BACKUP_DIR" ] && { [ -d "$BACKUP_DIR" ] || mkdir -p "$BACKUP_DIR"; } +if [ -n "$BACKUP_DIR" ]; then + if [ ! -d "$BACKUP_DIR" ]; then + mkdir -p "$BACKUP_DIR" 2>/dev/null || true + fi +fi # - - - - - - - - - - - - - - - - - - - - - - - - - if [ -f "$ENTRYPOINT_INIT_FILE" ]; then ENTRYPOINT_MESSAGE="no" ENTRYPOINT_FIRST_RUN="no" fi # - - - - - - - - - - - - - - - - - - - - - - - - - if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then - # Show start message if [ "$CONFIG_DIR_INITIALIZED" = "no" ] || [ "$DATA_DIR_INITIALIZED" = "no" ]; then - [ "$ENTRYPOINT_MESSAGE" = "yes" ] && echo "Executing entrypoint script for alpine" + if [ "$ENTRYPOINT_MESSAGE" = "yes" ]; then + echo "Executing entrypoint script for GEN_SCRIPT_REPLACE_APPNAME" + fi fi # - - - - - - - - - - - - - - - - - - - - - - - - - # Set reusable variables - { { [ -w "/etc" ] && [ ! -f "/etc/hosts" ]; } || [ -w "/etc/hosts" ]; } && UPDATE_FILE_HOSTS="yes" && touch "/etc/hosts" - { { [ -w "/etc" ] && [ ! -f "/etc/timezone" ]; } || [ -w "/etc/timezone" ]; } && UPDATE_FILE_TZ="yes" && touch "/etc/timezone" - { { [ -w "/etc" ] && [ ! -f "/etc/resolv.conf" ]; } || [ -w "/etc/resolv.conf" ]; } && UPDATE_FILE_RESOLV="yes" && touch "/etc/resolv.conf" + if [ -w "/etc" ] && [ ! -f "/etc/hosts" ]; then + UPDATE_FILE_HOSTS="yes" + touch "/etc/hosts" + elif [ -w "/etc/hosts" ]; then + UPDATE_FILE_HOSTS="yes" + touch "/etc/hosts" + fi + if [ -w "/etc" ] && [ ! -f "/etc/timezone" ]; then + UPDATE_FILE_TZ="yes" + touch "/etc/timezone" + elif [ -w "/etc/timezone" ]; then + UPDATE_FILE_TZ="yes" + touch "/etc/timezone" + fi + if [ -w "/etc" ] && [ ! -f "/etc/resolv.conf" ]; then + UPDATE_FILE_RESOLV="yes" + touch "/etc/resolv.conf" + elif [ -w "/etc/resolv.conf" ]; then + UPDATE_FILE_RESOLV="yes" + touch "/etc/resolv.conf" + fi # - - - - - - - - - - - - - - - - - - - - - - - - - # Set timezone - [ -n "$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && echo "$TZ" >"/etc/timezone" - [ -f "/usr/share/zoneinfo/$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && ln -sf "/usr/share/zoneinfo/$TZ" "/etc/localtime" + if [ -n "$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ]; then + echo "$TZ" >"/etc/timezone" 2>/dev/null || true + fi + if [ -f "/usr/share/zoneinfo/$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ]; then + ln -sf "/usr/share/zoneinfo/$TZ" "/etc/localtime" 2>/dev/null || true + fi # - - - - - - - - - - - - - - - - - - - - - - - - - # if ipv6 add it to /etc/hosts if [ "$UPDATE_FILE_HOSTS" = "yes" ]; then - echo "# known hostname mappings" >"/etc/hosts" + echo "# known hostname mappings" >"/etc/hosts" 2>/dev/null || true if [ -n "$(ip a 2>/dev/null | grep 'inet6.*::' || ifconfig 2>/dev/null | grep 'inet6.*::')" ]; then - __printf_space "40" "::1" "localhost" >>"/etc/hosts" - __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts" + __printf_space "40" "::1" "localhost" >>"/etc/hosts" 2>/dev/null || true + __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts" 2>/dev/null || true else - __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts" + __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts" 2>/dev/null || true fi fi # - - - - - - - - - - - - - - - - - - - - - - - - - # add .internal domain if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ -n "$HOSTNAME" ]; then - __grep_test " $HOSTNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "$HOSTNAME" >>"/etc/hosts" - __grep_test " ${HOSTNAME%%.*}.internal" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.internal" >>"/etc/hosts" + if ! __grep_test " $HOSTNAME" "/etc/hosts"; then + __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "$HOSTNAME" >>"/etc/hosts" 2>/dev/null || true + fi + if ! __grep_test " ${HOSTNAME%%.*}.internal" "/etc/hosts"; then + __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.internal" >>"/etc/hosts" 2>/dev/null || true + fi fi # - - - - - - - - - - - - - - - - - - - - - - - - - # add domainname if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ "$DOMAINNAME" != "internal" ] && [ -n "$DOMAINNAME" ] && [ "$HOSTNAME.$DOMAINNAME" != "$DOMAINNAME" ]; then - __grep_test " ${HOSTNAME%%.*}.$DOMAINNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.$DOMAINNAME" >>"/etc/hosts" + if ! __grep_test " ${HOSTNAME%%.*}.$DOMAINNAME" "/etc/hosts"; then + __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.$DOMAINNAME" >>"/etc/hosts" 2>/dev/null || true + fi fi # - - - - - - - - - - - - - - - - - - - - - - - - - # Set containers hostname - [ -n "$HOSTNAME" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && echo "$HOSTNAME" >"/etc/hostname" + if [ -n "$HOSTNAME" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ]; then + echo "$HOSTNAME" >"/etc/hostname" 2>/dev/null || true + fi # - - - - - - - - - - - - - - - - - - - - - - - - - if [ -f "/etc/hostname" ]; then - [ -n "$(type -P hostname)" ] && hostname -F "/etc/hostname" &>/dev/null || HOSTNAME="$(<"/etc/hostname")" + if [ -n "$(type -P hostname 2>/dev/null)" ]; then + hostname -F "/etc/hostname" 2>/dev/null || true + else + HOSTNAME="$(<"/etc/hostname")" 2>/dev/null || true + fi export HOSTNAME fi # - - - - - - - - - - - - - - - - - - - - - - - - - # import hosts file into container - [ -f "/usr/local/etc/hosts" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && cat "/usr/local/etc/hosts" | grep -vF "$HOSTNAME" >>"/etc/hosts" + if [ -f "/usr/local/etc/hosts" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ]; then + cat "/usr/local/etc/hosts" 2>/dev/null | grep -vF "$HOSTNAME" >>"/etc/hosts" 2>/dev/null || true + fi # - - - - - - - - - - - - - - - - - - - - - - - - - # import resolv.conf file into container - [ "$CUSTOM_DNS" != "yes" ] && [ -f "/usr/local/etc/resolv.conf" ] && [ "$UPDATE_FILE_RESOLV" = "yes" ] && cat "/usr/local/etc/resolv.conf" >"/etc/resolv.conf" + if [ "$CUSTOM_DNS" != "yes" ] && [ -f "/usr/local/etc/resolv.conf" ] && [ "$UPDATE_FILE_RESOLV" = "yes" ]; then + cat "/usr/local/etc/resolv.conf" >"/etc/resolv.conf" 2>/dev/null || true + fi # - - - - - - - - - - - - - - - - - - - - - - - - - if [ -n "$HOME" ] && [ -d "/usr/local/etc/skel" ]; then - [ -d "$HOME" ] && cp -Rf "/usr/local/etc/skel/." "$HOME/" + if [ -d "$HOME" ]; then + cp -Rf "/usr/local/etc/skel/." "$HOME/" 2>/dev/null || true + fi fi # - - - - - - - - - - - - - - - - - - - - - - - - - fi # - - - - - - - - - - - - - - - - - - - - - - - - - # Delete any .gitkeep files -[ -d "/data" ] && rm -Rf "/data/.gitkeep" "/data"/*/*.gitkeep -[ -d "/config" ] && rm -Rf "/config/.gitkeep" "/config"/*/*.gitkeep -[ -f "/usr/local/bin/.gitkeep" ] && rm -Rf "/usr/local/bin/.gitkeep" +if [ -d "/data" ]; then + rm -Rf "/data/.gitkeep" "/data"/*/*.gitkeep 2>/dev/null || true +fi +if [ -d "/config" ]; then + rm -Rf "/config/.gitkeep" "/config"/*/*.gitkeep 2>/dev/null || true +fi +if [ -f "/usr/local/bin/.gitkeep" ]; then + rm -Rf "/usr/local/bin/.gitkeep" 2>/dev/null || true +fi # - - - - - - - - - - - - - - - - - - - - - - - - - # Setup bin directory - /config/bin > /usr/local/bin __initialize_custom_bin_dir @@ -336,7 +429,7 @@ if [ -f "$ENTRYPOINT_INIT_FILE" ]; then fi # - - - - - - - - - - - - - - - - - - - - - - - - - if [ -d "/config" ]; then - echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_INIT_FILE" + echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_INIT_FILE" 2>/dev/null || true fi # - - - - - - - - - - - - - - - - - - - - - - - - - # Check if this is a new container @@ -345,7 +438,7 @@ if [ -f "$ENTRYPOINT_DATA_INIT_FILE" ]; then fi # - - - - - - - - - - - - - - - - - - - - - - - - - if [ -d "/data" ]; then - echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_DATA_INIT_FILE" + echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_DATA_INIT_FILE" 2>/dev/null || true fi # - - - - - - - - - - - - - - - - - - - - - - - - - if [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ]; then @@ -353,7 +446,7 @@ if [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ]; then fi # - - - - - - - - - - - - - - - - - - - - - - - - - if [ -d "/config" ]; then - echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_CONFIG_INIT_FILE" + echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_CONFIG_INIT_FILE" 2>/dev/null || true fi # - - - - - - - - - - - - - - - - - - - - - - - - - if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then @@ -371,12 +464,18 @@ else rm -f /run/__start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true fi # - - - - - - - - - - - - - - - - - - - - - - - - - -[ "$ENTRYPOINT_MESSAGE" = "yes" ] && __printf_space "40" "The containers ip address is:" "$CONTAINER_IP4_ADDRESS" +if [ "$ENTRYPOINT_MESSAGE" = "yes" ]; then + __printf_space "40" "The containers ip address is:" "$CONTAINER_IP4_ADDRESS" +fi # - - - - - - - - - - - - - - - - - - - - - - - - - # Show configured listing processes if [ "$ENTRYPOINT_MESSAGE" = "yes" ] && [ -n "$ENV_PORTS" ]; then show_port="" - for port in $ENV_PORTS; do [ -n "$port" ] && show_port+="$(printf '%s ' "${port// /}") "; done + for port in $ENV_PORTS; do + if [ -n "$port" ]; then + show_port+="$(printf '%s ' "${port// /}") " + fi + done __printf_space "40" "The following ports are open:" "$show_port" unset port show_port fi @@ -580,7 +679,11 @@ start) export PATH="/usr/local/etc/docker/init.d:$PATH" if [ $# -eq 0 ]; then scripts="$(ls -A "/usr/local/etc/docker/init.d")" - [ -n "$scripts" ] && echo "$scripts" || echo "No scripts found in: /usr/local/etc/docker/init.d" + if [ -n "$scripts" ]; then + echo "$scripts" + else + echo "No scripts found in: /usr/local/etc/docker/init.d" + fi exit elif [ "$1" = "all" ]; then shift $# @@ -599,7 +702,11 @@ start) if [ $# -eq 0 ]; then if [ ! -f "$ENTRYPOINT_PID_FILE" ]; then echo "$$" >"$ENTRYPOINT_PID_FILE" - [ "$START_SERVICES" = "no" ] && [ "$CONTAINER_INIT" = "yes" ] || __start_init_scripts "/usr/local/etc/docker/init.d" + if [ "$START_SERVICES" = "no" ] && [ "$CONTAINER_INIT" = "yes" ]; then + : + else + __start_init_scripts "/usr/local/etc/docker/init.d" + fi fi __no_exit else diff --git a/rootfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh index 4a2f6c5..d41e492 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 : 202407241259-git +##@Version : 202511301145-git # @@Author : Jason Hempstead # @@Contact : git-admin@casjaysdev.pro # @@License : LICENSE.md @@ -21,8 +21,15 @@ # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # - - - - - - - - - - - - - - - - - - - - - - - - - # 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")" || true -{ [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; } && set -xo pipefail -x$DEBUGGER_OPTIONS && export DEBUGGER="on" || set -o pipefail +if [ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ]; then + export DEBUGGER_OPTIONS="$(<"/config/.debug")" +fi +if [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; then + set -xo pipefail -x$DEBUGGER_OPTIONS + export DEBUGGER="on" +else + set -o pipefail +fi # - - - - - - - - - - - - - - - - - - - - - - - - - __remove_extra_spaces() { sed 's/\( \)*/\1/g;s|^ ||g'; } # - - - - - - - - - - - - - - - - - - - - - - - - - @@ -38,22 +45,123 @@ __printf_space() { printf '%s\n' "$message" } # - - - - - - - - - - - - - - - - - - - - - - - - - -__mkdir() { [ -n "$1" ] && mkdir -p "$@" || return 1; } -__rm() { [ -n "$1" ] && [ -e "$1" ] && rm -Rf "${1:?}"; } -__grep_test() { grep -sh "$1" "$2" | grep -qwF "${3:-$1}" || return 1; } -__netstat() { [ -f "$(type -P netstat)" ] && netstat "$@" || return 10; } -__cd() { { [ -d "$1" ] || mkdir -p "$1"; } && builtin cd "$1" || return 1; } -__is_in_file() { [ -e "$2" ] && grep -Rsq "$1" "$2" && return 0 || return 1; } -__curl() { curl -q -sfI --max-time 3 -k -o /dev/null "$@" &>/dev/null || return 10; } -__find() { find "$1" -mindepth 1 -type ${2:-f,d} 2>/dev/null | grep '.' || return 10; } -__pcheck() { [ -n "$(which pgrep 2>/dev/null)" ] && pgrep -x "$1" &>/dev/null || return 10; } -__file_exists_with_content() { [ -n "$1" ] && [ -f "$1" ] && [ -s "$1" ] && return 0 || return 2; } -__sed() { sed -i 's|'$1'|'$2'|g' "$3" &>/dev/null || sed -i "s|$1|$2|g" "$3" &>/dev/null || return 1; } -__ps() { [ -f "$(type -P ps)" ] && ps "$@" 2>/dev/null | sed 's|:||g' | grep -Fw " ${1:-$SERVICE_NAME}$" || return 10; } -__is_dir_empty() { if [ -n "$1" ]; then [ "$(ls -A "$1" 2>/dev/null | wc -l)" -eq 0 ] && return 0 || return 1; else return 1; fi; } -__get_ip6() { ip a 2>/dev/null | grep -w 'inet6' | awk '{print $2}' | grep -vE '^::1|^fe' | sed 's|/.*||g' | head -n1 | grep '.' || echo ''; } -__get_ip4() { ip a 2>/dev/null | grep -w 'inet' | awk '{print $2}' | grep -vE '^127.0.0' | sed 's|/.*||g' | head -n1 | grep '.' || echo '127.0.0.1'; } -__find_and_remove() { find "${2:-/etc}" -iname "$1" -exec rm -Rfv {} \; 2>/dev/null; } +__mkdir() { + if [ -n "$1" ]; then + mkdir -p "$@" 2>/dev/null || true + fi +} +__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 + return 1 + fi + else + return 1 + fi +} +__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 +} +__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 +} +__find_and_remove() { + find "${2:-/etc}" -iname "$1" -exec rm -Rfv {} \; 2>/dev/null || true +} # - - - - - - - - - - - - - - - - - - - - - - - - - __pgrep() { local count=3 @@ -68,24 +176,36 @@ __pgrep() { } # - - - - - - - - - - - - - - - - - - - - - - - - - __find_file_relative() { - [ -e "$1" ] || return 0 - find "$1"/* -not -path '*env/*' -not -path '.git*' -type f 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '.' || false + 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 } # - - - - - - - - - - - - - - - - - - - - - - - - - __find_directory_relative() { - [ -d "$1" ] || return 0 - find "$1"/* -not -path '*env/*' -not -path '.git*' -type d 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '.' || false + 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 } # - - - - - - - - - - - - - - - - - - - - - - - - - __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 '')" - [ -n "$result" ] && return 0 || return 1 + if [ -n "$result" ]; then + return 0 + else + return 1 + fi } __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 '')" - [ -n "$result" ] && return 0 || return 1 + if [ -n "$result" ]; then + return 0 + else + return 1 + fi } __get_pid() { local result="" @@ -204,10 +324,22 @@ __init_working_dir() { [ -z "$WORK_DIR" ] && [ "$HOME" = "/root" ] && [ "$RUNAS_USER" != "root" ] && [ "$PWD" != "/tmp" ] && home="${workdir:-$home}" [ -z "$WORK_DIR" ] && [ "$HOME" = "/root" ] && [ "$SERVICE_USER" != "root" ] && [ "$PWD" != "/tmp" ] && home="${workdir:-$home}" # create needed directories - [ -n "$home" ] && { [ -d "$home" ] || mkdir -p "$home"; } - [ -n "$workdir" ] && { [ -d "$workdir" ] || mkdir -p "$workdir"; } - [ "$SERVICE_USER" = "root" ] || [ -d "$home" ] && chmod -f 777 "$home" - [ "$SERVICE_USER" = "root" ] || [ -d "$workdir" ] && chmod -f 777 "$workdir" + if [ -n "$home" ]; then + if [ ! -d "$home" ]; then + mkdir -p "$home" + fi + fi + if [ -n "$workdir" ]; then + if [ ! -d "$workdir" ]; then + mkdir -p "$workdir" + fi + fi + if [ "$SERVICE_USER" != "root" ] && [ -d "$home" ]; then + chmod -f 777 "$home" + fi + if [ "$SERVICE_USER" != "root" ] && [ -d "$workdir" ]; then + chmod -f 777 "$workdir" + fi # - - - - - - - - - - - - - - - - - - - - - - - - - # cd to dir __cd "${workdir:-$home}" @@ -223,7 +355,12 @@ __exec_service() { eval "$@" 2>>/dev/stderr >>/data/logs/start.log & while [ $count -ne 0 ]; do sleep 3 - __pgrep $1 && touch "/run/init.d/$1.pid" && break || count=$((count - 1)) + if __pgrep $1; then + touch "/run/init.d/$1.pid" + break + else + count=$((count - 1)) + fi done } # - - - - - - - - - - - - - - - - - - - - - - - - - @@ -252,17 +389,41 @@ __certbot() { is_renewal="$(find /etc/letsencrypt/renewal -type f 2>/dev/null || false)" [ -f "/config/env/ssl.sh" ] && . "/config/env/ssl.sh" [ -f "/config/certbot/env.sh" ] && . "/config/certbot/env.sh" - [ -n "$SSL_KEY" ] && { mkdir -p "$(dirname "$SSL_KEY")" || true; } || { echo "The variable $SSL_KEY is not set" >&2 && return 1; } - [ -n "$SSL_CERT" ] && { mkdir -p "$(dirname "$SSL_CERT")" || true; } || { echo "The variable $SSL_CERT is not set" >&2 && return 1; } + if [ -n "$SSL_KEY" ]; then + mkdir -p "$(dirname "$SSL_KEY")" 2>/dev/null || true + else + echo "The variable SSL_KEY is not set" >&2 + return 1 + fi + if [ -n "$SSL_CERT" ]; then + mkdir -p "$(dirname "$SSL_CERT")" 2>/dev/null || true + else + echo "The variable SSL_CERT is not set" >&2 + return 1 + fi domain_list="$CERTBOT_DOMAINS www.$CERTBOT_DOMAINS mail.$CERTBOT_DOMAINS" domain_list="$(echo "$domain_list" | tr ' ' '\n' | sort -u | tr '\n' ' ')" - [ "$CERT_BOT_ENABLED" = "true" ] || { export CERT_BOT_ENABLED="" && return 10; } - [ -n "$CERT_BOT_MAIL" ] || { echo "The variable CERT_BOT_MAIL is not set" >&2 && return 1; } - [ -n "$CERTBOT_DOMAINS" ] || { echo "The variable CERTBOT_DOMAINS is not set" >&2 && return 1; } + if [ "$CERT_BOT_ENABLED" != "true" ]; then + export CERT_BOT_ENABLED="" + return 10 + fi + if [ -z "$CERT_BOT_MAIL" ]; then + echo "The variable CERT_BOT_MAIL is not set" >&2 + return 1 + fi + if [ -z "$CERTBOT_DOMAINS" ]; then + echo "The variable CERTBOT_DOMAINS is not set" >&2 + return 1 + fi for domain in $CERTBOT_DOMAINS; do [ -n "$domain" ] && ADD_CERTBOT_DOMAINS+="-d $domain " done - [ -n "$is_renewal" ] && options="renew" ADD_CERTBOT_DOMAINS="" || options="certonly" + if [ -n "$is_renewal" ]; then + options="renew" + ADD_CERTBOT_DOMAINS="" + else + options="certonly" + fi certbot_key_opts="$certbot_key_opts $ADD_CERTBOT_DOMAINS" if [ -f "/config/certbot/setup.sh" ]; then eval "/config/certbot/setup.sh" @@ -329,7 +490,10 @@ __create_ssl_cert() { local SSL_DIR="${SSL_DIR:-/etc/ssl}" if ! __certbot certonly; then [ -f "/config/env/ssl.sh" ] && . "/config/env/ssl.sh" - [ -n "$SSL_DIR" ] || { echo "SSL_DIR is unset" && return 1; } + if [ -z "$SSL_DIR" ]; then + echo "SSL_DIR is unset" + return 1 + fi [ -d "$SSL_DIR" ] || mkdir -p "$SSL_DIR" if [ -n "$FORCE_SSL" ] || [ ! -f "$SSL_CERT" ] || [ ! -f "$SSL_KEY" ]; then echo "Setting Country to $COUNTRY and Setting State/Province to $STATE and Setting City to $CITY" @@ -436,8 +600,18 @@ __run_once() { # run program ever n minutes __cron() { trap 'retVal=$?;[ -f "/run/cron/$bin.run" ] && rm -Rf "/run/cron/$bin.run";[ -f "/run/cron/$bin.pid" ] && rm -Rf "/run/cron/$bin.pid";exit ${retVal:-0}' SIGINT ERR EXIT - [ "$1" = "--pid" ] && pid="$2" && shift 2 || pid="$$" - test -n "$1" && test -z "${1//[0-9]/}" && interval=$(($1 * 60)) && shift 1 || interval="300" + if [ "$1" = "--pid" ]; then + pid="$2" + shift 2 + else + pid="$$" + fi + if test -n "$1" && test -z "${1//[0-9]/}"; then + interval=$(($1 * 60)) + shift 1 + else + interval="300" + fi [ $# -eq 0 ] && echo "Usage: cron [interval] [command]" && exit 1 local command="$*" local bin="$(basename "${CRON_NAME:-$1}")" @@ -583,12 +757,12 @@ __fix_permissions() { fi } # - - - - - - - - - - - - - - - - - - - - - - - - - -__get_gid() { grep "^$1:" /etc/group | awk -F ':' '{print $3}' || false; } -__get_uid() { grep "^$1:" /etc/passwd | awk -F ':' '{print $3}' || false; } -__check_for_uid() { cat "/etc/passwd" 2>/dev/null | awk -F ':' '{print $3}' | sort -u | grep -q "^$1$" || false; } -__check_for_guid() { cat "/etc/group" 2>/dev/null | awk -F ':' '{print $3}' | sort -u | grep -q "^$1$" || false; } -__check_for_user() { cat "/etc/passwd" 2>/dev/null | awk -F ':' '{print $1}' | sort -u | grep -q "^$1$" || false; } -__check_for_group() { cat "/etc/group" 2>/dev/null | awk -F ':' '{print $1}' | sort -u | grep -q "^$1$" || false; } +__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; } # - - - - - - - - - - - - - - - - - - - - - - - - - # check if process is already running __proc_check() { @@ -612,8 +786,12 @@ __set_user_group_id() { local random_id="$(__generate_random_uids)" set_uid="$(__get_uid "$set_user" || echo "$set_uid")" set_gid="$(__get_gid "$set_user" || echo "$set_gid")" - grep -shq "^$set_user:" "/etc/passwd" "/etc/group" || return 0 - [ -n "$set_user" ] && [ "$set_user" != "root" ] || return + if ! grep -shq "^$set_user:" "/etc/passwd" "/etc/group"; then + return 0 + fi + if [ -z "$set_user" ] || [ "$set_user" = "root" ]; then + return + 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 @@ -642,8 +820,8 @@ __create_service_user() { [ -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 "Error: No user or group specified to create" >&2 - return 1 + echo "No user or group specified to create" >&2 + 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 @@ -805,7 +983,12 @@ __exec_command() { # Setup the server init scripts __start_init_scripts() { [ "$1" = " " ] && shift 1 - [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -o pipefail -x$DEBUGGER_OPTIONS || set -o pipefail + if [ "$DEBUGGER" = "on" ]; then + echo "Enabling debugging" + set -o pipefail -x$DEBUGGER_OPTIONS + else + set -o pipefail + fi local retPID="" local basename="" local init_pids="" @@ -1249,7 +1432,11 @@ __initialize_www_root() { [ -d "/usr/local/share/httpd/default" ] && WWW_TEMPLATE="/usr/local/share/httpd/default" [ "$WWW_ROOT_DIR" = "/app" ] && WWW_INIT="${WWW_INIT:-true}" [ "$WWW_ROOT_DIR" = "/data/htdocs" ] && WWW_INIT="${WWW_INIT:-true}" - __is_dir_empty "$WWW_ROOT_DIR/" && WWW_INIT="true" || WWW_INIT="false" + if __is_dir_empty "$WWW_ROOT_DIR/"; then + WWW_INIT="true" + else + WWW_INIT="false" + fi if [ "$WWW_INIT" = "true" ] && [ -d "$WWW_TEMPLATE" ]; then cp -Rf "$DEFAULT_DATA_DIR/data/htdocs/." "$WWW_ROOT_DIR/" 2>/dev/null fi @@ -1259,7 +1446,11 @@ __initialize_www_root() { __is_htdocs_mounted() { WWW_ROOT_DIR="${WWW_ROOT_DIR:-/data/htdocs}" [ -n "$ENV_WWW_ROOT_DIR" ] && WWW_ROOT_DIR="$ENV_WWW_ROOT_DIR" - [ -n "$IMPORT_FROM_GIT" ] && echo "$IMPORT_FROM_GIT" | grep -qE 'https://|http://|git://|ssh://' || unset IMPORT_FROM_GIT + if [ -n "$IMPORT_FROM_GIT" ]; then + if ! echo "$IMPORT_FROM_GIT" | grep -qE 'https://|http://|git://|ssh://'; then + unset IMPORT_FROM_GIT + fi + fi if [ -n "$IMPORT_FROM_GIT" ] && [ "$(command -v "git" 2>/dev/null)" ]; then if __is_dir_empty "$WWW_ROOT_DIR"; then echo "Importing project from $IMPORT_FROM_GIT to $WWW_ROOT_DIR" @@ -1351,7 +1542,12 @@ __switch_to_user() { su_cmd() { $su_exec -c "$@" || return 1; } else su_exec="" - su_cmd() { echo "Can not switch to $switch_user: attempting to run as root" && eval "$@" || return 1; } + su_cmd() { + echo "Can not switch to $switch_user: attempting to run as root" + if ! eval "$@"; then + return 1 + fi + } fi export su_exec } @@ -1359,8 +1555,18 @@ __switch_to_user() { # usage backup "days" "hours" __backup() { local dirs="" backup_dir backup_name backup_exclude runTime cronTime maxDays - test -n "$1" && test -z "${1//[0-9]/}" && maxDays="$1" && shift 1 || maxDays="7" - test -n "$1" && test -z "${1//[0-9]/}" && cronTime="$1" && shift 1 || cronTime="" + if test -n "$1" && test -z "${1//[0-9]/}"; then + maxDays="$1" + shift 1 + else + maxDays="7" + fi + if test -n "$1" && test -z "${1//[0-9]/}"; then + cronTime="$1" + shift 1 + else + cronTime="" + fi local exitCodeP=0 local exitStatus=0 local pidFile="/run/backup.pid" @@ -1390,7 +1596,11 @@ __backup() { fi [ -f "$pidFile" ] && __rm "$pidFile" [ -n "$maxDays" ] && find "$BACKUP_DIR"* -mtime +$maxDays -exec rm -Rf {} \; >/dev/null 2>&1 - [ -n "$cronTime" ] && runTime=$((cronTime * 3600)) || return $exitStatus + if [ -n "$cronTime" ]; then + runTime=$((cronTime * 3600)) + else + return $exitStatus + fi sleep $runTime && __backup "$maxDays" "$cronTime" } # - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1445,9 +1655,27 @@ export ENTRYPOINT_DATA_INIT_FILE="${ENTRYPOINT_DATA_INIT_FILE:-/data/.docker_has export ENTRYPOINT_CONFIG_INIT_FILE="${ENTRYPOINT_CONFIG_INIT_FILE:-/config/.docker_has_run}" # - - - - - - - - - - - - - - - - - - - - - - - - - # is already Initialized -[ -z "$DATA_DIR_INITIALIZED" ] && { [ -f "$ENTRYPOINT_DATA_INIT_FILE" ] && DATA_DIR_INITIALIZED="true" || DATA_DIR_INITIALIZED="false"; } -[ -z "$CONFIG_DIR_INITIALIZED" ] && { [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ] && CONFIG_DIR_INITIALIZED="true" || CONFIG_DIR_INITIALIZED="false"; } -[ -z "$ENTRYPOINT_FIRST_RUN" ] && { { [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; } && ENTRYPOINT_FIRST_RUN="no" || ENTRYPOINT_FIRST_RUN="true"; } +if [ -z "$DATA_DIR_INITIALIZED" ]; then + if [ -f "$ENTRYPOINT_DATA_INIT_FILE" ]; then + DATA_DIR_INITIALIZED="true" + else + DATA_DIR_INITIALIZED="false" + fi +fi +if [ -z "$CONFIG_DIR_INITIALIZED" ]; then + if [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ]; then + CONFIG_DIR_INITIALIZED="true" + else + CONFIG_DIR_INITIALIZED="false" + fi +fi +if [ -z "$ENTRYPOINT_FIRST_RUN" ]; then + if [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; then + ENTRYPOINT_FIRST_RUN="no" + else + ENTRYPOINT_FIRST_RUN="true" + fi +fi export ENTRYPOINT_DATA_INIT_FILE DATA_DIR_INITIALIZED ENTRYPOINT_CONFIG_INIT_FILE CONFIG_DIR_INITIALIZED export ENTRYPOINT_PID_FILE ENTRYPOINT_INIT_FILE ENTRYPOINT_FIRST_RUN # - - - - - - - - - - - - - - - - - - - - - - - - -