From commits-return-1063-archive-asf-public=cust-asf.ponee.io@yetus.apache.org Thu Apr 5 23:44:17 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id D996B18064F for ; Thu, 5 Apr 2018 23:44:16 +0200 (CEST) Received: (qmail 91987 invoked by uid 500); 5 Apr 2018 21:44:16 -0000 Mailing-List: contact commits-help@yetus.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@yetus.apache.org Delivered-To: mailing list commits@yetus.apache.org Received: (qmail 91977 invoked by uid 99); 5 Apr 2018 21:44:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Apr 2018 21:44:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2EEA1F68CE; Thu, 5 Apr 2018 21:44:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sekikn@apache.org To: commits@yetus.apache.org Date: Thu, 05 Apr 2018 21:44:16 -0000 Message-Id: In-Reply-To: <3339f01210a5435a9e03482d21b6463a@git.apache.org> References: <3339f01210a5435a9e03482d21b6463a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 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 Authored: Thu Apr 5 09:20:15 2018 -0400 Committer: Kengo Seki 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=" "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=" "Limit a Docker container's memory usage (default: ${DOCKER_MEMORY})" - + if [[ "${DOCKER_CLEANUP_CMD}" == false ]]; then + yetus_add_option "--dockermemlimit=" "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