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>
87 lines
2.0 KiB
Go
87 lines
2.0 KiB
Go
package config
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/opts"
|
|
"github.com/docker/docker/api/types/swarm"
|
|
"github.com/docker/docker/pkg/system"
|
|
"github.com/pkg/errors"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type createOptions struct {
|
|
name string
|
|
templateDriver string
|
|
file string
|
|
labels opts.ListOpts
|
|
}
|
|
|
|
func newConfigCreateCommand(dockerCli command.Cli) *cobra.Command {
|
|
createOpts := createOptions{
|
|
labels: opts.NewListOpts(opts.ValidateEnv),
|
|
}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "create [OPTIONS] CONFIG file|-",
|
|
Short: "Create a config from a file or STDIN",
|
|
Args: cli.ExactArgs(2),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
createOpts.name = args[0]
|
|
createOpts.file = args[1]
|
|
return runConfigCreate(dockerCli, createOpts)
|
|
},
|
|
}
|
|
flags := cmd.Flags()
|
|
flags.VarP(&createOpts.labels, "label", "l", "Config labels")
|
|
flags.StringVar(&createOpts.templateDriver, "template-driver", "", "Template driver")
|
|
flags.SetAnnotation("driver", "version", []string{"1.37"})
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runConfigCreate(dockerCli command.Cli, options createOptions) error {
|
|
client := dockerCli.Client()
|
|
ctx := context.Background()
|
|
|
|
var in io.Reader = dockerCli.In()
|
|
if options.file != "-" {
|
|
file, err := system.OpenSequential(options.file)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
in = file
|
|
defer file.Close()
|
|
}
|
|
|
|
configData, err := ioutil.ReadAll(in)
|
|
if err != nil {
|
|
return errors.Errorf("Error reading content from %q: %v", options.file, err)
|
|
}
|
|
|
|
spec := swarm.ConfigSpec{
|
|
Annotations: swarm.Annotations{
|
|
Name: options.name,
|
|
Labels: opts.ConvertKVStringsToMap(options.labels.GetAll()),
|
|
},
|
|
Data: configData,
|
|
}
|
|
if options.templateDriver != "" {
|
|
spec.Templating = &swarm.Driver{
|
|
Name: options.templateDriver,
|
|
}
|
|
}
|
|
r, err := client.ConfigCreate(ctx, spec)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Fprintln(dockerCli.Out(), r.ID)
|
|
return nil
|
|
}
|