YETUS-623. docker-cleanup doesn't support options which start with docker correctly
Signed-off-by: Allen Wittenauer <aw@apache.org>
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 @@
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
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 @@
;;
esac
done
+
+ docker_parse_args "$@"
}
## @description Print the usage information
