Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for multiple composefile when deploying
Using a custom version of mergo to manage special cases Signed-off-by: Vincent Demeester <vincent@sbr.pm>
- Loading branch information
1 parent
10e292d
commit 2455685
Showing
14 changed files
with
927 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| package loader | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/docker/cli/cli/compose/types" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| /* | ||
| func TestLoadTwoDifferentVersion(t *testing.T) { | ||
| configDetails := types.ConfigDetails{ | ||
| ConfigFiles: []types.ConfigFile{ | ||
| {Filename: "base.yml", Config: map[string]interface{}{ | ||
| "version": "2.0", | ||
| }}, | ||
| {Filename: "override.yml", Config: map[string]interface{}{ | ||
| "version": "3.0", | ||
| }}, | ||
| }, | ||
| } | ||
| _, err := Load(configDetails) | ||
| require.Error(t, err) | ||
| } | ||
| */ | ||
|
|
||
| func TestSimpleLoad(t *testing.T) { | ||
| base := map[string]interface{}{ | ||
| "version": "3.4", | ||
| "services": map[string]interface{}{ | ||
| "foo": map[string]interface{}{ | ||
| "image": "foo", | ||
| "build": map[string]interface{}{ | ||
| "context": ".", | ||
| "dockerfile": "bar.Dockerfile", | ||
| }, | ||
| "labels": []interface{}{ | ||
| "foo=bar", | ||
| }, | ||
| "cap_add": []interface{}{ | ||
| "NET_ADMIN", | ||
| }, | ||
| }, | ||
| }, | ||
| "volumes": map[string]interface{}{}, | ||
| "networks": map[string]interface{}{}, | ||
| "secrets": map[string]interface{}{}, | ||
| "configs": map[string]interface{}{}, | ||
| } | ||
| override := map[string]interface{}{ | ||
| "version": "3.4", | ||
| "services": map[string]interface{}{ | ||
| "foo": map[string]interface{}{ | ||
| "image": "baz", | ||
| "build": map[string]interface{}{ | ||
| "dockerfile": "foo.Dockerfile", | ||
| "args": []interface{}{ | ||
| "buildno=1", | ||
| "password=secret", | ||
| }, | ||
| }, | ||
| "labels": map[string]interface{}{ | ||
| "foo": "baz", | ||
| }, | ||
| "cap_add": []interface{}{ | ||
| "SYS_ADMIN", | ||
| }, | ||
| }, | ||
| "bar": map[string]interface{}{ | ||
| "image": "bar", | ||
| }, | ||
| }, | ||
| "volumes": map[string]interface{}{}, | ||
| "networks": map[string]interface{}{}, | ||
| "secrets": map[string]interface{}{}, | ||
| "configs": map[string]interface{}{}, | ||
| } | ||
| configDetails := types.ConfigDetails{ | ||
| ConfigFiles: []types.ConfigFile{ | ||
| {Filename: "base.yml", Config: base}, | ||
| {Filename: "override.yml", Config: override}, | ||
| }, | ||
| } | ||
| config, err := Load(configDetails) | ||
| require.NoError(t, err) | ||
| require.Equal(t, &types.Config{ | ||
| Services: []types.ServiceConfig{ | ||
| { | ||
| Name: "bar", | ||
| Image: "bar", | ||
| Environment: types.MappingWithEquals{}, | ||
| }, | ||
| { | ||
| Name: "foo", | ||
| Image: "baz", | ||
| Build: types.BuildConfig{ | ||
| Dockerfile: "foo.Dockerfile", | ||
| Args: types.MappingWithEquals{ | ||
| "buildno": strPtr("1"), | ||
| "password": strPtr("secret"), | ||
| }, | ||
| }, | ||
| Labels: types.Labels{ | ||
| "foo": "baz", | ||
| }, | ||
| CapAdd: []string{"NET_ADMIN", "SYS_ADMIN"}, | ||
| Environment: types.MappingWithEquals{}, | ||
| }}, | ||
| Networks: map[string]types.NetworkConfig{}, | ||
| Volumes: map[string]types.VolumeConfig{}, | ||
| Secrets: map[string]types.SecretConfig{}, | ||
| Configs: map[string]types.ConfigObjConfig{}, | ||
| }, config) | ||
| } |
Oops, something went wrong.