upgrade libcompose to fbdac0a6a80837c63eb6c8f43514f7bb3f32df6c

This commit is contained in:
Tuna
2016-10-09 02:35:51 +02:00
parent 5a37bf0fb4
commit 592cc95907
567 changed files with 6730 additions and 44603 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/api/client/bundlefile"
"github.com/docker/docker/cli/command/bundlefile"
"github.com/skippbox/kompose/pkg/kobject"
)
-1
View File
@@ -163,7 +163,6 @@ func (c *Compose) LoadFile(file string) kobject.KomposeObject {
serviceConfig.Command = composeServiceConfig.Entrypoint
serviceConfig.Args = composeServiceConfig.Command
// load environment variables
envs := loadEnvVars(composeServiceConfig.Environment.ToMap())
serviceConfig.Environment = envs