6f8070deb2
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>
48 lines
1.1 KiB
Go
48 lines
1.1 KiB
Go
package container
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/cli/command/formatter"
|
|
"github.com/pkg/errors"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type diffOptions struct {
|
|
container string
|
|
}
|
|
|
|
// NewDiffCommand creates a new cobra.Command for `docker diff`
|
|
func NewDiffCommand(dockerCli command.Cli) *cobra.Command {
|
|
var opts diffOptions
|
|
|
|
return &cobra.Command{
|
|
Use: "diff CONTAINER",
|
|
Short: "Inspect changes to files or directories on a container's filesystem",
|
|
Args: cli.ExactArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
opts.container = args[0]
|
|
return runDiff(dockerCli, &opts)
|
|
},
|
|
}
|
|
}
|
|
|
|
func runDiff(dockerCli command.Cli, opts *diffOptions) error {
|
|
if opts.container == "" {
|
|
return errors.New("Container name cannot be empty")
|
|
}
|
|
ctx := context.Background()
|
|
|
|
changes, err := dockerCli.Client().ContainerDiff(ctx, opts.container)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
diffCtx := formatter.Context{
|
|
Output: dockerCli.Out(),
|
|
Format: formatter.NewDiffFormat("{{.Type}} {{.Path}}"),
|
|
}
|
|
return formatter.DiffWrite(diffCtx, changes)
|
|
}
|