Merge pull request #2683 from thaJeztah/update_shellcheck

Dockerfiles: update shellcheck v0.7.1

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/<SCXXXX>
@@ -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

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

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" \