1e1dd5bca4
Fix panic when pruning images with label-filter
...
Before this change:
docker image prune --force --filter "label=foobar"
panic: assignment to entry in nil map
goroutine 1 [running]:
github.com/docker/cli/vendor/github.com/docker/docker/api/types/filters.Args.Add(...)
/go/src/github.com/docker/cli/vendor/github.com/docker/docker/api/types/filters/parse.go:167
github.com/docker/cli/cli/command/image.runPrune(0x1db3a20, 0xc000344cf0, 0x16e0001, 0xc00015e600, 0x4, 0x3, 0xc00024e160, 0xc000545c70, 0x5ab4b5)
/go/src/github.com/docker/cli/cli/command/image/prune.go:79 +0xbaf
github.com/docker/cli/cli/command/image.NewPruneCommand.func1(0xc00029ef00, 0xc0004a8180, 0x0, 0x3, 0x0, 0x0)
/go/src/github.com/docker/cli/cli/command/image/prune.go:32 +0x64
github.com/docker/cli/vendor/github.com/spf13/cobra.(*Command).execute(0xc00029ef00, 0xc000038210, 0x3, 0x3, 0xc00029ef00, 0xc000038210)
/go/src/github.com/docker/cli/vendor/github.com/spf13/cobra/command.go:762 +0x473
github.com/docker/cli/vendor/github.com/spf13/cobra.(*Command).ExecuteC(0xc000127180, 0xc000272770, 0x1836ce0, 0xc000272780)
/go/src/github.com/docker/cli/vendor/github.com/spf13/cobra/command.go:852 +0x2fd
github.com/docker/cli/vendor/github.com/spf13/cobra.(*Command).Execute(0xc000127180, 0xc000127180, 0x1d60880)
/go/src/github.com/docker/cli/vendor/github.com/spf13/cobra/command.go:800 +0x2b
main.main()
/go/src/github.com/docker/cli/cmd/docker/docker.go:180 +0xdc
With this patch applied:
docker image prune --force --filter "label=foobar"
Total reclaimed space: 0B
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-12-07 17:56:31 +01:00
6f8070deb2
Switch from x/net/context to context
...
Since go 1.7, "context" is a standard package. Since go 1.9,
x/net/context merely provides some types aliased to those in
the standard context package.
The changes were performed by the following script:
for f in $(git ls-files \*.go | grep -v ^vendor/); do
sed -i 's|golang.org/x/net/context|context|' $f
goimports -w $f
for i in 1 2; do
awk '/^$/ {e=1; next;}
/\t"context"$/ {e=0;}
{if (e) {print ""; e=0}; print;}' < $f > $f.new && \
mv $f.new $f
goimports -w $f
done
done
[v2: do awk/goimports fixup twice]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-05-11 16:49:43 -07:00
Tibor Vass
Sebastiaan van Stijn
Li Yi
Kir Kolyshkin
Daniel Nephin
Vincent Demeester
Ignacio Capurro
Daniel Nephin