deep-stack/kompose
4
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Code Refactor (#1438)

Browse Source 
* Code refactor
Signed-off-by: Hang Yan <hang.yan@hotmail.com>
This commit is contained in:
Hang Yan
2021-10-03 17:33:43 +08:00
committed by GitHub
parent 9a6a24cb16
commit 5d7ed192a4
10 changed files with 149 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/loader/compose/utils.go
+1 -1
View File
@@ -156,7 +156,7 @@ func normalizeVolumes(svcName string) string {
func normalizeNetworkNames(netName string) (string, error) {
netval := strings.ToLower(strings.Replace(netName, "_", "-", -1))
regString := ("[^A-Za-z0-9.-]+")
regString := "[^A-Za-z0-9.-]+"
reg, err := regexp.Compile(regString)
if err != nil {
return "", err
pkg/loader/compose/v1v2.go
+1 -1
View File
@@ -231,7 +231,7 @@ func libComposeToKomposeMapping(composeObject *project.Project) (kobject.Kompose
}
// convert compose labels to annotations
serviceConfig.Annotations = map[string]string(composeServiceConfig.Labels)
serviceConfig.Annotations = composeServiceConfig.Labels
serviceConfig.CPUQuota = int64(composeServiceConfig.CPUQuota)
serviceConfig.CapAdd = composeServiceConfig.CapAdd
serviceConfig.CapDrop = composeServiceConfig.CapDrop
pkg/loader/compose/v3.go
+1 -1
View File
@@ -382,7 +382,7 @@ func dockerComposeToKomposeMapping(composeObject *types.Config) (kobject.Kompose
serviceConfig.Name = name
serviceConfig.Image = composeServiceConfig.Image
serviceConfig.WorkingDir = composeServiceConfig.WorkingDir
serviceConfig.Annotations = map[string]string(composeServiceConfig.Labels)
serviceConfig.Annotations = composeServiceConfig.Labels
serviceConfig.CapAdd = composeServiceConfig.CapAdd
serviceConfig.CapDrop = composeServiceConfig.CapDrop
serviceConfig.Expose = composeServiceConfig.Expose