modules/nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dk: ajout de l'option -e

Browse Source
This commit is contained in:
Jephté Clain 2020-02-14 11:18:32 +04:00
parent 08c081ac33
commit b7492fc34e
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dk
View File

@ -213,6 +213,8 @@ OPTIONS générales
commandes. Utiliser -u pour desélectionner la machine en cours, e.g -m-u commandes. Utiliser -u pour desélectionner la machine en cours, e.g -m-u
-n, --fake -n, --fake
Ne pas lancer les commandes, simplement les afficher Ne pas lancer les commandes, simplement les afficher
-e, --build-arg, --env VAR=VALUE
(Re)définir un argument pour le build ou une variable d'environnement
-f, --force -f, --force
Forcer l'opération (là où cela a du sens) Forcer l'opération (là où cela a du sens)
-h, --host HOST -h, --host HOST
@ -360,11 +362,13 @@ function docker_parse_env_args() {
[ -f .build.env ] && eval "$(docker_parse_build_args .build.env)" [ -f .build.env ] && eval "$(docker_parse_build_args .build.env)"
[ -f build.env ] && eval "$(docker_parse_build_args build.env)" [ -f build.env ] && eval "$(docker_parse_build_args build.env)"
[ -n "$PROFILE" -a -f ".build.$PROFILE.env" ] && eval "$(docker_parse_build_args ".build.$PROFILE.env")" [ -n "$PROFILE" -a -f ".build.$PROFILE.env" ] && eval "$(docker_parse_build_args ".build.$PROFILE.env")"
[ -n "$PROFILE" -a -f "build.$PROFILE.env" ] && eval "$(docker_parse_build_args "build.$PROFILE.env")"
} }
function docker_set_env_args() { function docker_set_env_args() {
[ -f .build.env ] && source ./.build.env [ -f .build.env ] && source ./.build.env
[ -f build.env ] && source ./build.env [ -f build.env ] && source ./build.env
[ -n "$PROFILE" -a -f ".build.$PROFILE.env" ] && source "./.build.$PROFILE.env" [ -n "$PROFILE" -a -f ".build.$PROFILE.env" ] && source "./.build.$PROFILE.env"
[ -n "$PROFILE" -a -f "build.$PROFILE.env" ] && source "./build.$PROFILE.env"
} }
function docker_set_run_args() { function docker_set_run_args() {
replace_run_args+=(--env-file "$1") replace_run_args+=(--env-file "$1")
@ -799,6 +803,7 @@ function initialize_build_env() {
DIST= DIST=
} }
function default_update_build_env() { function default_update_build_env() {
local var
if [ -n "$DIST" ]; then if [ -n "$DIST" ]; then
[ -n "$VERSION" ] && VERSION="$VERSION-" [ -n "$VERSION" ] && VERSION="$VERSION-"
VERSION="$VERSION$DIST" VERSION="$VERSION$DIST"
@ -806,6 +811,10 @@ function default_update_build_env() {
fi fi
[ -n "$VERSION" ] || docker_add_build_arg VERSION "$(get_version)" [ -n "$VERSION" ] || docker_add_build_arg VERSION "$(get_version)"
[ -n "$VERSION" ] && TAGS+=("$VERSION") [ -n "$VERSION" ] && TAGS+=("$VERSION")
# Variables en ligne de commande
for var in "${VARS[@]}"; do
docker_add_build_arg "${var%%=*}" "${var#*=}"
done
} }
function update_build_env() { default_update_build_env; } function update_build_env() { default_update_build_env; }
@ -1031,6 +1040,11 @@ function auto_run() {
eval "$(utools_local parse_opts)" eval "$(utools_local parse_opts)"
local detach no_deps rm=1 service_ports use_aliases volume local detach no_deps rm=1 service_ports use_aliases volume
local -a envs labels local -a envs labels
local var
for var in "${VARS[@]}"; do
envs+=(-e "$var")
done
args=( args=(
+ +
-d,--detach detach=1 -d,--detach detach=1
@ -1502,6 +1516,7 @@ CONFIG=
DM_SET_MACHINE= DM_SET_MACHINE=
USE_STACK= USE_STACK=
FAKE= FAKE=
VARS=()
FORCE= FORCE=
NO_CACHE= NO_CACHE=
HOST= HOST=
@ -1520,6 +1535,7 @@ args=(
-m:,--set-machine: DM_SET_MACHINE= -m:,--set-machine: DM_SET_MACHINE=
--stack USE_STACK=1 --stack USE_STACK=1
-n,--fake FAKE=1 -n,--fake FAKE=1
-e:,--build-arg:,--env: VARS
-f,--force FORCE=1 -f,--force FORCE=1
-j,--no-cache NO_CACHE=1 -j,--no-cache NO_CACHE=1
-h:,--host: HOST= -h:,--host: HOST=