mirror of
https://github.com/casjaysdevdocker/remotely
synced 2026-06-24 02:01:00 -04:00
♻️ Migrate remotely to /config/ source-of-truth architecture ♻️
Migrate remotely Docker image to the new build-time config architecture.
- rootfs/root/docker/setup/03-files.sh: rewrite to canonical form with /tmp/bin, /tmp/var, /tmp/etc, /tmp/usr handlers; remove template-files copy block
- rootfs/usr/local/etc/docker/functions/entrypoint.sh: update to latest template with __init_service_conf, __find_php_ini, __find_php_bin helpers
- rootfs/usr/local/etc/docker/init.d/*.sh: fix $(basename) UUOC → ${var##*/}; move inline comments above code lines; remove commented-out dead code
- rootfs/usr/local/share/template-files/: delete entire directory; config files now deployed via /tmp/etc/ at build time
rootfs/root/docker/setup/03-files.sh
rootfs/usr/local/etc/docker/functions/entrypoint.sh
rootfs/usr/local/etc/docker/init.d/01-remotely.sh
rootfs/usr/local/etc/docker/init.d/99-nginx.sh
rootfs/usr/local/share/template-files/config/env/default.sample
rootfs/usr/local/share/template-files/config/env/examples/00-directory.sh
rootfs/usr/local/share/template-files/config/env/examples/addresses.sh
rootfs/usr/local/share/template-files/config/env/examples/certbot.sh
rootfs/usr/local/share/template-files/config/env/examples/couchdb.sh
rootfs/usr/local/share/template-files/config/env/examples/dockerd.sh
rootfs/usr/local/share/template-files/config/env/examples/global.sh
rootfs/usr/local/share/template-files/config/env/examples/healthcheck.sh
rootfs/usr/local/share/template-files/config/env/examples/mariadb.sh
rootfs/usr/local/share/template-files/config/env/examples/mongodb.sh
rootfs/usr/local/share/template-files/config/env/examples/networking.sh
rootfs/usr/local/share/template-files/config/env/examples/other.sh
rootfs/usr/local/share/template-files/config/env/examples/php.sh
rootfs/usr/local/share/template-files/config/env/examples/postgres.sh
rootfs/usr/local/share/template-files/config/env/examples/redis.sh
rootfs/usr/local/share/template-files/config/env/examples/services.sh
rootfs/usr/local/share/template-files/config/env/examples/ssl.sh
rootfs/usr/local/share/template-files/config/env/examples/supabase.sh
rootfs/usr/local/share/template-files/config/env/examples/webservers.sh
rootfs/usr/local/share/template-files/config/env/examples/zz-entrypoint.sh
rootfs/usr/local/share/template-files/config/.gitkeep
rootfs/usr/local/share/template-files/data/.gitkeep
rootfs/usr/local/share/template-files/defaults/.gitkeep
This commit is contained in:
@@ -48,7 +48,7 @@ __script_exit() {
|
||||
fi
|
||||
}
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
SCRIPT_NAME="$(basename "$SCRIPT_FILE" 2>/dev/null)"
|
||||
SCRIPT_NAME="${SCRIPT_FILE##*/}"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# exit if __start_init_scripts function hasn't been Initialized
|
||||
if [ ! -f "/run/.start_init_scripts.pid" ]; then
|
||||
@@ -74,15 +74,20 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME"
|
||||
RESET_ENV="no"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Default predefined variables
|
||||
DATA_DIR="/data/remotely" # set data directory
|
||||
CONF_DIR="/config/remotely" # set config directory
|
||||
# set data directory
|
||||
DATA_DIR="/data/remotely"
|
||||
# set config directory
|
||||
CONF_DIR="/config/remotely"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# set the containers etc directory
|
||||
ETC_DIR="/etc/remotely"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
TMP_DIR="/tmp/remotely" # set the temp dir
|
||||
RUN_DIR="/run/remotely" # set scripts pid dir
|
||||
LOG_DIR="/data/logs/remotely" # set log directory
|
||||
# set the temp dir
|
||||
TMP_DIR="/tmp/remotely"
|
||||
# set scripts pid dir
|
||||
RUN_DIR="/run/remotely"
|
||||
# set log directory
|
||||
LOG_DIR="/data/logs/remotely"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# port which service is listening on
|
||||
SERVICE_PORT="5000"
|
||||
@@ -121,7 +126,7 @@ APPLICATION_DIRS="$RUN_DIR $ETC_DIR $CONF_DIR $LOG_DIR $TMP_DIR"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Standard service initialization follows the same pattern as other repos
|
||||
SERVICE_EXIT_CODE=0
|
||||
EXEC_CMD_NAME="$(basename "$EXEC_CMD_BIN")"
|
||||
EXEC_CMD_NAME="${EXEC_CMD_BIN##*/}"
|
||||
SERVICE_PID_FILE="/run/init.d/$EXEC_CMD_NAME.pid"
|
||||
SERVICE_PID_NUMBER="$(__pgrep)"
|
||||
EXEC_CMD_BIN="$(type -P "$EXEC_CMD_BIN" || echo "$EXEC_CMD_BIN")"
|
||||
@@ -167,7 +172,7 @@ __update_conf_files
|
||||
__run_start_script() {
|
||||
local cmd="$(eval echo "${EXEC_CMD_BIN:-}")"
|
||||
local args="$(eval echo "${EXEC_CMD_ARGS:-}")"
|
||||
local name="$(basename "$cmd")"
|
||||
local name="${cmd##*/}"
|
||||
|
||||
if [ -z "$cmd" ]; then
|
||||
echo "Initializing $SCRIPT_NAME has completed"
|
||||
|
||||
@@ -48,7 +48,7 @@ __script_exit() {
|
||||
fi
|
||||
}
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
SCRIPT_NAME="$(basename "$SCRIPT_FILE" 2>/dev/null)"
|
||||
SCRIPT_NAME="${SCRIPT_FILE##*/}"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# exit if __start_init_scripts function hasn't been Initialized
|
||||
if [ ! -f "/run/.start_init_scripts.pid" ]; then
|
||||
@@ -71,15 +71,20 @@ done
|
||||
START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Default predefined variables
|
||||
DATA_DIR="/data/nginx" # set data directory
|
||||
CONF_DIR="/config/nginx" # set config directory
|
||||
# set data directory
|
||||
DATA_DIR="/data/nginx"
|
||||
# set config directory
|
||||
CONF_DIR="/config/nginx"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# set the containers etc directory
|
||||
ETC_DIR="/etc/nginx"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
TMP_DIR="/tmp/nginx" # set the temp dir
|
||||
RUN_DIR="/run/nginx" # set scripts pid dir
|
||||
LOG_DIR="/data/logs/nginx" # set log directory
|
||||
# set the temp dir
|
||||
TMP_DIR="/tmp/nginx"
|
||||
# set scripts pid dir
|
||||
RUN_DIR="/run/nginx"
|
||||
# set log directory
|
||||
LOG_DIR="/data/logs/nginx"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# port which service is listening on
|
||||
SERVICE_PORT="80"
|
||||
@@ -105,7 +110,7 @@ APPLICATION_DIRS="$RUN_DIR $ETC_DIR $CONF_DIR $LOG_DIR $TMP_DIR"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Standard service initialization
|
||||
SERVICE_EXIT_CODE=0
|
||||
EXEC_CMD_NAME="$(basename "$EXEC_CMD_BIN")"
|
||||
EXEC_CMD_NAME="${EXEC_CMD_BIN##*/}"
|
||||
SERVICE_PID_FILE="/run/init.d/$EXEC_CMD_NAME.pid"
|
||||
SERVICE_PID_NUMBER="$(__pgrep)"
|
||||
EXEC_CMD_BIN="$(type -P "$EXEC_CMD_BIN" || echo "$EXEC_CMD_BIN")"
|
||||
@@ -132,7 +137,7 @@ __fix_permissions "$SERVICE_USER" "$SERVICE_GROUP"
|
||||
__run_start_script() {
|
||||
local cmd="$(eval echo "${EXEC_CMD_BIN:-}")"
|
||||
local args="$(eval echo "${EXEC_CMD_ARGS:-}")"
|
||||
local name="$(basename "$cmd")"
|
||||
local name="${cmd##*/}"
|
||||
|
||||
if [ -z "$cmd" ]; then
|
||||
echo "Initializing $SCRIPT_NAME has completed"
|
||||
|
||||
Reference in New Issue
Block a user