Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2683 from thaJeztah/update_shellcheck 

Dockerfiles: update shellcheck v0.7.1
This commit is contained in:
Silvin Lubecki 2020-08-21 15:01:44 +02:00 committed by GitHub
parent ca35f2973a 43bc718895
commit 8189013731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/completion/bash/docker
View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck disable=SC2016,SC2119,SC2155,SC2206,SC2207 # shellcheck disable=SC2016,SC2119,SC2155,SC2206,SC2207,SC2254
# #
# Shellcheck ignore list: # Shellcheck ignore list:
# - SC2016: Expressions don't expand in single quotes, use double quotes for that. # - 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. # - SC2155: Declare and assign separately to avoid masking return values.
# - SC2206: Quote to prevent word splitting, or split robustly with mapfile or read -a. # - 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). # - 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: # You can find more details for each warning at the following page:
# https://github.com/koalaman/shellcheck/wiki/<SCXXXX> # https://github.com/koalaman/shellcheck/wiki/<SCXXXX>
@ -688,7 +689,7 @@ __docker_pos_first_nonflag() {
(( counter++ )) (( counter++ ))
done done
echo $counter echo "$counter"
} }
# __docker_map_key_of_current_option returns `key` if we are currently completing the # __docker_map_key_of_current_option returns `key` if we are currently completing the

2
dockerfiles/Dockerfile.shellcheck
View File

@ -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 RUN apk add --no-cache bash make
WORKDIR /go/src/github.com/docker/cli WORKDIR /go/src/github.com/docker/cli
ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 ENV DISABLE_WARN_OUTSIDE_CONTAINER=1

1
scripts/gen/windows-resources
View File

@ -31,6 +31,7 @@ defs=
[ -n "$GITCOMMIT" ] && defs+=( "-D DOCKER_COMMIT=\"$GITCOMMIT\"") [ -n "$GITCOMMIT" ] && defs+=( "-D DOCKER_COMMIT=\"$GITCOMMIT\"")
makeres() { makeres() {
# shellcheck disable=SC2086
"$WINDRES" \ "$WINDRES" \
-i "$RESOURCES/$1" \ -i "$RESOURCES/$1" \
-o "$3" \ -o "$3" \