tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4736 from shin-/4734-config_secrets 

Repair bad import
This commit is contained in:
Joffrey F 2017-04-17 19:27:43 -07:00 committed by GitHub
parent 702eb4cc92 c817dedef7
commit baf457c78c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/config/serialize.py
View File

@ -7,9 +7,9 @@ import yaml
from compose.config import types
from compose.const import COMPOSEFILE_V1 as V1
from compose.const import COMPOSEFILE_V2_1 as V2_1
from compose.const import COMPOSEFILE_V2_1 as V2_2
from compose.const import COMPOSEFILE_V2_2 as V2_2
from compose.const import COMPOSEFILE_V3_1 as V3_1
from compose.const import COMPOSEFILE_V3_1 as V3_2
from compose.const import COMPOSEFILE_V3_2 as V3_2
def serialize_config_type(dumper, data):

1
tests/acceptance/cli_test.py
View File

@ -323,6 +323,7 @@ class CLITestCase(DockerClientTestCase):
assert yaml.load(result.stdout) == {
'version': '3.2',
'networks': {},
'secrets': {},
'volumes': {
'foobar': {
'labels': {