You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@yetus.apache.org by se...@apache.org on 2018/04/05 21:44:16 UTC
[2/2] yetus git commit: YETUS-623. docker-cleanup doesn't support
options which start with docker correctly
YETUS-623. docker-cleanup doesn't support options which start with docker correctly
Signed-off-by: Allen Wittenauer <aw...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/e56ba299
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/e56ba299
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/e56ba299
Branch: refs/heads/master
Commit: e56ba299c1cd0f79579986ebd37cf57376add710
Parents: 6534bd5
Author: Kengo Seki <se...@apache.org>
Authored: Thu Apr 5 09:20:15 2018 -0400
Committer: Kengo Seki <se...@apache.org>
Committed: Thu Apr 5 17:29:47 2018 -0400
----------------------------------------------------------------------
precommit/core.d/docker.sh | 5 +++--
precommit/docker-cleanup.sh | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/yetus/blob/e56ba299/precommit/core.d/docker.sh
----------------------------------------------------------------------
diff --git a/precommit/core.d/docker.sh b/precommit/core.d/docker.sh
index 1f6eff3..50bf432 100755
--- a/precommit/core.d/docker.sh
+++ b/precommit/core.d/docker.sh
@@ -55,8 +55,9 @@ function docker_usage
yetus_add_option "--dockerprivd=<bool>" "Run docker in privileged mode (default: '${DOCKER_ENABLE_PRIVILEGED}')"
fi
yetus_add_option "--dockerdelrep" "In Docker mode, only report image/container deletions, not act on them"
- yetus_add_option "--dockermemlimit=<num>" "Limit a Docker container's memory usage (default: ${DOCKER_MEMORY})"
-
+ if [[ "${DOCKER_CLEANUP_CMD}" == false ]]; then
+ yetus_add_option "--dockermemlimit=<num>" "Limit a Docker container's memory usage (default: ${DOCKER_MEMORY})"
+ fi
}
## @description Docker-specific argument parsing
http://git-wip-us.apache.org/repos/asf/yetus/blob/e56ba299/precommit/docker-cleanup.sh
----------------------------------------------------------------------
diff --git a/precommit/docker-cleanup.sh b/precommit/docker-cleanup.sh
index 0e2a94b..1d17b1b 100755
--- a/precommit/docker-cleanup.sh
+++ b/precommit/docker-cleanup.sh
@@ -143,6 +143,8 @@ function parse_args
;;
esac
done
+
+ docker_parse_args "$@"
}
## @description Print the usage information