vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #118 from mrunalp/ctr_name

Browse source 
Allow overriding the container name in the config
This commit is contained in:
Antonio Murdaca 2016-10-07 20:49:39 +02:00 committed by GitHub
commit 0cf8daa786
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmd/client/container.go
View file

@ -35,6 +35,11 @@ var createContainerCommand = cli.Command{
Value: "config.json",
Usage: "the path of a container config file",
},
cli.StringFlag{
Name: "name",
Value: "",
Usage: "the name of the container",
},
},
Action: func(context *cli.Context) error {
// Set up a connection to the server.
@ -49,7 +54,7 @@ var createContainerCommand = cli.Command{
return fmt.Errorf("Please specify the id of the pod sandbox to which the container belongs via the --pod option")
}
// Test RuntimeServiceClient.CreateContainer
err = CreateContainer(client, context.String("pod"), context.String("config"))
err = CreateContainer(client, context.String("pod"), context.String("config"), context.String("name"))
if err != nil {
return fmt.Errorf("Creating container failed: %v", err)
}
@ -187,12 +192,17 @@ var listContainersCommand = cli.Command{
// CreateContainer sends a CreateContainerRequest to the server, and parses
// the returned CreateContainerResponse.
func CreateContainer(client pb.RuntimeServiceClient, sandbox string, path string) error {
func CreateContainer(client pb.RuntimeServiceClient, sandbox string, path string, name string) error {
config, err := loadContainerConfig(path)
if err != nil {
return err
}
// Override the name by the one specified through CLI
if name != "" {
config.Metadata.Name = &name
}
r, err := client.CreateContainer(context.Background(), &pb.CreateContainerRequest{
PodSandboxId: &sandbox,
Config: config,