From 43bc718895f3b2a52adcc14630d500a1b002f6da Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 19 Aug 2020 19:55:13 +0200 Subject: [PATCH] Dockerfiles: update shellcheck v0.7.1 full diff: https://github.com/koalaman/shellcheck/compare/v0.7.0...v0.7.1 Signed-off-by: Sebastiaan van Stijn --- contrib/completion/bash/docker | 5 +++-- dockerfiles/Dockerfile.shellcheck | 2 +- scripts/gen/windows-resources | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 272c1f2fc9..38f6491b97 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# shellcheck disable=SC2016,SC2119,SC2155,SC2206,SC2207 +# shellcheck disable=SC2016,SC2119,SC2155,SC2206,SC2207,SC2254 # # Shellcheck ignore list: # - SC2016: Expressions don't expand in single quotes, use double quotes for that. @@ -7,6 +7,7 @@ # - SC2155: Declare and assign separately to avoid masking return values. # - SC2206: Quote to prevent word splitting, or split robustly with mapfile or read -a. # - SC2207: Prefer mapfile or read -a to split command output (or quote to avoid splitting). +# - SC2254: Quote expansions in case patterns to match literally rather than as a glob. # # You can find more details for each warning at the following page: # https://github.com/koalaman/shellcheck/wiki/ @@ -688,7 +689,7 @@ __docker_pos_first_nonflag() { (( counter++ )) done - echo $counter + echo "$counter" } # __docker_map_key_of_current_option returns `key` if we are currently completing the diff --git a/dockerfiles/Dockerfile.shellcheck b/dockerfiles/Dockerfile.shellcheck index e23751e7aa..188aadeb8a 100644 --- a/dockerfiles/Dockerfile.shellcheck +++ b/dockerfiles/Dockerfile.shellcheck @@ -1,4 +1,4 @@ -FROM koalaman/shellcheck-alpine:v0.7.0 +FROM koalaman/shellcheck-alpine:v0.7.1 RUN apk add --no-cache bash make WORKDIR /go/src/github.com/docker/cli ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 diff --git a/scripts/gen/windows-resources b/scripts/gen/windows-resources index 66d20f396a..e9cdff8bba 100755 --- a/scripts/gen/windows-resources +++ b/scripts/gen/windows-resources @@ -31,6 +31,7 @@ defs= [ -n "$GITCOMMIT" ] && defs+=( "-D DOCKER_COMMIT=\"$GITCOMMIT\"") makeres() { + # shellcheck disable=SC2086 "$WINDRES" \ -i "$RESOURCES/$1" \ -o "$3" \