From e74c12e45289911d36a071769f7125853dea1b44 Mon Sep 17 00:00:00 2001 From: Hang Yan Date: Wed, 19 Jun 2019 23:31:03 +0800 Subject: [PATCH] Fix container_name set error --- pkg/transformer/kubernetes/k8sutils.go | 9 ++++++++- script/test/fixtures/v3/docker-compose-full-example.yaml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/transformer/kubernetes/k8sutils.go b/pkg/transformer/kubernetes/k8sutils.go index ae88f1de..23035445 100644 --- a/pkg/transformer/kubernetes/k8sutils.go +++ b/pkg/transformer/kubernetes/k8sutils.go @@ -380,7 +380,7 @@ func (k *Kubernetes) UpdateKubernetesObjects(name string, service kobject.Servic // fillTemplate fills the pod template with the value calculated from config fillTemplate := func(template *api.PodTemplateSpec) error { if len(service.ContainerName) > 0 { - template.Spec.Containers[0].Name = service.ContainerName + template.Spec.Containers[0].Name = FormatContainerName(service.ContainerName) } template.Spec.Containers[0].Env = envs template.Spec.Containers[0].Command = service.Command @@ -650,3 +650,10 @@ func FormatFileName(name string) string { envName = strings.Replace(envName, "_", "-", -1) return envName } + +//FormatContainerName format Container name +func FormatContainerName(name string) string { + name = strings.Replace(name, "_", "-", -1) + return name + +} diff --git a/script/test/fixtures/v3/docker-compose-full-example.yaml b/script/test/fixtures/v3/docker-compose-full-example.yaml index 4c67640e..6d582d6e 100644 --- a/script/test/fixtures/v3/docker-compose-full-example.yaml +++ b/script/test/fixtures/v3/docker-compose-full-example.yaml @@ -15,7 +15,7 @@ services: command: bundle exec thin -p 3000 # command: ["bundle", "exec", "thin", "-p", "3000"] - container_name: my-web-container + container_name: my_web-container depends_on: - db