rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-26 23:06:51 +00:00
Code Issues Releases Wiki Activity

Fix the container name

Browse Source 
https://github.com/rancher/os/issues/2176
This commit is contained in:
niusmallnan 2017-12-15 16:15:13 +08:00 committed by niusmallnan
parent f87dc8078a
commit 2dda87e2c4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/power/power.go
View File

@ -26,6 +26,8 @@ import (
// You can't shutdown the system from a process in console because we want to stop the console container. // You can't shutdown the system from a process in console because we want to stop the console container.
// If you do that you kill yourself. So we spawn a separate container to do power operations // If you do that you kill yourself. So we spawn a separate container to do power operations
// This can up because on shutdown we want ssh to gracefully die, terminating ssh connections and not just hanging tcp session // This can up because on shutdown we want ssh to gracefully die, terminating ssh connections and not just hanging tcp session
//
// Be careful of container name. only [a-zA-Z0-9][a-zA-Z0-9_.-] are allowed
func runDocker(name string) error { func runDocker(name string) error {
if os.ExpandEnv("${IN_DOCKER}") == "true" { if os.ExpandEnv("${IN_DOCKER}") == "true" {
return nil return nil
@ -37,13 +39,14 @@ func runDocker(name string) error {
} }
cmd := []string{name} cmd := []string{name}
containerName := strings.TrimPrefix(strings.Join(strings.Split(name, "/"), "-"), "-")
if name == "" { if name == "" {
name = filepath.Base(os.Args[0]) name = filepath.Base(os.Args[0])
cmd = os.Args cmd = os.Args
} }
existing, err := client.ContainerInspect(context.Background(), name) existing, err := client.ContainerInspect(context.Background(), containerName)
if err == nil && existing.ID != "" { if err == nil && existing.ID != "" {
err := client.ContainerRemove(context.Background(), types.ContainerRemoveOptions{ err := client.ContainerRemove(context.Background(), types.ContainerRemoveOptions{
ContainerID: existing.ID, ContainerID: existing.ID,
@ -78,7 +81,7 @@ func runDocker(name string) error {
currentContainer.ID, currentContainer.ID,
}, },
Privileged: true, Privileged: true,
}, nil, name) }, nil, containerName)
if err != nil { if err != nil {
return err return err
} }