add the config and compose modules
config: dotenv files are parsed, never sourced, so a value can hold a # or a $(...) without breaking or executing. The make engine included .env with make syntax, which neither allowed. compose: one call per project instead of one per sub-stack.
This commit is contained in:
Yann Autissier
@@ -0,0 +1,60 @@
|
||||
#shellcheck shell=sh
|
||||
# compose: find a usable docker compose, and call it once per project.
|
||||
#
|
||||
# The legacy engine ran one `docker compose up` per sub-stack, each time with
|
||||
# the full file list, so N sub-stacks meant N identical calls. The CLI calls
|
||||
# compose once per project (documented in spec/golden/DELTAS.md).
|
||||
|
||||
MYOS_COMPOSE_MIN_VERSION=${COMPOSE_VERSION:-2.24.4}
|
||||
|
||||
# myos_compose_bin print the compose command to use, fail with MYOS_E_NOREQ
|
||||
myos_compose_bin() {
|
||||
[ -n "${MYOS_COMPOSE_BIN:-}" ] && { printf '%s' "$MYOS_COMPOSE_BIN"; return 0; }
|
||||
if myos_have docker; then
|
||||
_v=$(docker compose version --short 2>/dev/null)
|
||||
if myos_verle "$MYOS_COMPOSE_MIN_VERSION" "$_v"; then printf 'docker compose'; return 0; fi
|
||||
fi
|
||||
if myos_have docker-compose; then
|
||||
_v=$(docker-compose version --short 2>/dev/null)
|
||||
if myos_verle "$MYOS_COMPOSE_MIN_VERSION" "$_v"; then printf 'docker-compose'; return 0; fi
|
||||
fi
|
||||
myos_error "docker compose >= $MYOS_COMPOSE_MIN_VERSION not found (install the docker compose plugin or docker-compose)"
|
||||
return "$MYOS_E_NOREQ"
|
||||
}
|
||||
|
||||
# myos_compose PROJECT FILES -- ARGS...
|
||||
# FILES is a newline separated list; the project directory is that of the first
|
||||
# file, so relative build contexts and env_file entries keep working.
|
||||
myos_compose() {
|
||||
_project=$1; _files=$2; shift 2
|
||||
[ "${1:-}" = "--" ] && shift
|
||||
[ -n "$_files" ] || { myos_error "no compose file for project $_project"; return "$MYOS_E_NOSTACK"; }
|
||||
_bin=$(myos_compose_bin) || return $?
|
||||
|
||||
_fargs=""
|
||||
_first=""
|
||||
for _f in $_files; do
|
||||
[ -n "$_first" ] || _first=$_f
|
||||
_fargs="$_fargs -f $_f"
|
||||
done
|
||||
_dir=$(dirname "$_first")
|
||||
|
||||
# variables the compose files reference, plus the network names they default
|
||||
# on (networks.yml is appended after the scan, so its variables are added here)
|
||||
# shellcheck disable=SC2086 # both are deliberate word lists
|
||||
_vars=$(myos_env_vars $_files)
|
||||
# shellcheck disable=SC2086
|
||||
_envargs=$(myos_env_export $_vars DOCKER_NETWORK_DEFAULT DOCKER_NETWORK_PRIVATE DOCKER_NETWORK_PUBLIC COMPOSE_SERVICE_NAME)
|
||||
|
||||
if [ "${DRYRUN:-false}" = true ]; then
|
||||
printf '%s%s -p %s --project-directory %s %s\n' "$_bin" "$_fargs" "$_project" "$_dir" "$*"
|
||||
else
|
||||
_IFS=$IFS; IFS='
|
||||
'
|
||||
# shellcheck disable=SC2046,SC2086 # deliberate word splitting on IFS=newline
|
||||
env $_envargs $_bin --ansi=auto $_fargs -p "$_project" --project-directory "$_dir" "$@"
|
||||
_rc=$?
|
||||
IFS=$_IFS
|
||||
return $_rc
|
||||
fi
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
#shellcheck shell=sh
|
||||
# config: where settings come from, and in which order.
|
||||
#
|
||||
# Layers, last one wins:
|
||||
# defaults < /etc/conf.d/myos, /etc/default/myos < ~/.config/myos/config
|
||||
# < <workdir>/.env < <workdir>/.env.<env> < environment < CLI VAR=val
|
||||
# MYOS_CONF_PRIORITY=system restores the old make behaviour where the system
|
||||
# file won over the project .env.
|
||||
#
|
||||
# Files are dotenv: KEY=value, one per line, # comments, optional quotes.
|
||||
# They are parsed, never sourced: a value never runs as code.
|
||||
|
||||
# myos_dotenv_parse FILE print normalized KEY=value lines
|
||||
myos_dotenv_parse() {
|
||||
[ -f "$1" ] || return 0
|
||||
sed -e 's/\r$//' -e '/^[[:space:]]*#/d' -e '/^[[:space:]]*$/d' "$1" |
|
||||
while IFS= read -r _line; do
|
||||
case $_line in *=*) ;; *) continue ;; esac
|
||||
_k=${_line%%=*}
|
||||
_v=${_line#*=}
|
||||
_k=$(printf '%s' "$_k" | tr -d '[:space:]')
|
||||
# whitespace around the = is not part of the value (make: s/[[:space:]]*=[[:space:]]*/=/)
|
||||
_v=${_v#"${_v%%[![:space:]]*}"}
|
||||
case $_k in ''|*[!A-Za-z0-9_]*) continue ;; esac
|
||||
# strip one layer of matching quotes
|
||||
case $_v in
|
||||
\"*\") _v=${_v#\"}; _v=${_v%\"} ;;
|
||||
\'*\') _v=${_v#\'}; _v=${_v%\'} ;;
|
||||
esac
|
||||
printf '%s=%s\n' "$_k" "$_v"
|
||||
done
|
||||
}
|
||||
|
||||
# myos_dotenv_load FILE set the variables of FILE that are not already set
|
||||
# (an already exported variable wins, as `?=` does in make)
|
||||
myos_dotenv_load() {
|
||||
[ -f "$1" ] || return 0
|
||||
while IFS= read -r _kv; do
|
||||
_k=${_kv%%=*}
|
||||
[ -n "$(myos_var "$_k")" ] && continue
|
||||
eval "$_k=\${_kv#*=}"
|
||||
done <<EOF
|
||||
$(myos_dotenv_parse "$1")
|
||||
EOF
|
||||
}
|
||||
|
||||
# myos_dotenv_has FILE KEY
|
||||
myos_dotenv_has() { myos_dotenv_parse "$1" | grep -q "^$2="; }
|
||||
|
||||
# myos_conf_files the system config files, most significant first
|
||||
myos_conf_files() {
|
||||
[ -n "${MYOS_CONF:-}" ] && { printf '%s\n' "$MYOS_CONF"; return 0; }
|
||||
for _f in /etc/conf.d/myos /etc/default/myos; do
|
||||
[ -r "$_f" ] && printf '%s\n' "$_f"
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
# myos_env_vars FILE... the ${VAR} names referenced by the compose files
|
||||
# (make: env-vars). $$VAR is a compose escape, not a shell variable.
|
||||
myos_env_vars() {
|
||||
[ $# -gt 0 ] || return 0
|
||||
sed 's/\$\$//g' "$@" 2>/dev/null |
|
||||
grep -oE '\$\{?[A-Z0-9_]+' |
|
||||
tr -d '{}$' |
|
||||
sort -u |
|
||||
tr '\n' ' ' |
|
||||
sed 's/ $//'
|
||||
}
|
||||
|
||||
# myos_env_export VAR... print VAR='value' for each variable that has a value,
|
||||
# ready to be passed to env(1)
|
||||
myos_env_export() {
|
||||
for _v in "$@"; do
|
||||
_val=$(myos_var "$_v")
|
||||
[ -n "$_val" ] && printf "%s=%s\n" "$_v" "$_val"
|
||||
done
|
||||
return 0
|
||||
}
|
||||
Reference in New Issue
Block a user