homelab/traefik
1
0
Fork 0
Code Activity

Migrate Sirupsen to sirupsen.

Browse source
This commit is contained in:
Ludovic Fernandez 2018-01-22 12:16:03 +01:00 • committed by Traefiker
parent c134dcd6fe
commit fb4ba7af2b
684 changed files with 92394 additions and 33943 deletions
Download patch file Download diff file Expand all files Collapse all files

5
vendor/github.com/docker/libcompose/config/merge.go generated vendored
View file

@ -6,11 +6,12 @@ import (
"fmt"
"strings"
"reflect"
"github.com/docker/docker/pkg/urlutil"
"github.com/docker/libcompose/utils"
composeYaml "github.com/docker/libcompose/yaml"
"gopkg.in/yaml.v2"
"reflect"
)
var (
@ -229,8 +230,6 @@ func readEnvFile(resourceLookup ResourceLookup, inFile string, serviceData RawSe
serviceData["environment"] = vars
delete(serviceData, "env_file")
return serviceData, nil
}