simono41/compose-viz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: extends and image conflict problem

Browse source
This commit is contained in:
wolfyeva 2022-05-18 18:01:35 +08:00
parent 687c761139
commit 63556d734f
1 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/test_parse_file.py
View file

@ -29,12 +29,11 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='common', name='common',
image='busybox',
extends=Extends(service_name='frontend'), extends=Extends(service_name='frontend'),
), ),
Service( Service(
name='cli', name='cli',
extends=['common'], extends=Extends(service_name='common'),
), ),
])), ])),
('tests/in/000011.yaml',Compose([ ('tests/in/000011.yaml',Compose([
@ -45,13 +44,11 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='monitoring', name='monitoring',
image='awesome/monitoring',
networks=['admin'], networks=['admin'],
extends=Extends(service_name='frontend'), extends=Extends(service_name='frontend'),
), ),
Service( Service(
name='backend', name='backend',
image='awesome/backend',
networks=['back-tier', 'admin'], networks=['back-tier', 'admin'],
extends=Extends(service_name='frontend'), extends=Extends(service_name='frontend'),
), ),
@ -94,12 +91,10 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='monitoring', name='monitoring',
image='awesome/monitoring',
extends=Extends(service_name='frontend'), extends=Extends(service_name='frontend'),
), ),
Service( Service(
name='backend', name='backend',
image='awesome/backend',
extends=Extends(service_name='frontend'), extends=Extends(service_name='frontend'),
ports=['8000:5001'], ports=['8000:5001'],
), ),
@ -113,13 +108,11 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='monitoring', name='monitoring',
image='awesome/monitoring',
networks=['admin'], networks=['admin'],
extends=Extends(service_name='frontend'), extends=Extends(service_name='frontend'),
), ),
Service( Service(
name='backend', name='backend',
image='awesome/backend',
ports=['8000:5001'], ports=['8000:5001'],
networks=['back-tier', 'admin'], networks=['back-tier', 'admin'],
extends=Extends(service_name='frontend'), extends=Extends(service_name='frontend'),
@ -175,7 +168,6 @@ from compose_viz.extends import Extends
('tests/in/001011.yaml',Compose([ ('tests/in/001011.yaml',Compose([
Service( Service(
name='frontend', name='frontend',
image='awesome/webapp',
networks=['front-tier', 'back-tier'], networks=['front-tier', 'back-tier'],
depends_on=['monitoring','backend'], depends_on=['monitoring','backend'],
extends=Extends(service_name='backend'), extends=Extends(service_name='backend'),
@ -236,7 +228,6 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='monitoring', name='monitoring',
image='awesome/monitoring',
depends_on=['backend'], depends_on=['backend'],
extends=Extends(service_name='frontend'), extends=Extends(service_name='frontend'),
ports=['8000:5010'], ports=['8000:5010'],
@ -255,7 +246,6 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='monitoring', name='monitoring',
image='awesome/monitoring',
networks=['admin'], networks=['admin'],
depends_on=['backend'], depends_on=['backend'],
extends=Extends(service_name='frontend'), extends=Extends(service_name='frontend'),
@ -317,7 +307,6 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='backend', name='backend',
image='awesome/backend',
networks=['back-tier', 'admin'], networks=['back-tier', 'admin'],
volumes=['db-data'], volumes=['db-data'],
extends=Extends(service_name='monitoring'), extends=Extends(service_name='monitoring'),
@ -361,7 +350,6 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='backend', name='backend',
image='awesome/backend',
volumes=['db-data'], volumes=['db-data'],
extends=Extends(service_name='monitoring'), extends=Extends(service_name='monitoring'),
ports=['8000:5000'], ports=['8000:5000'],
@ -380,7 +368,6 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='backend', name='backend',
image='awesome/backend',
networks=['back-tier', 'admin'], networks=['back-tier', 'admin'],
volumes=['db-data'], volumes=['db-data'],
extends=Extends(service_name='monitoring'), extends=Extends(service_name='monitoring'),
@ -433,7 +420,6 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='backend', name='backend',
image='awesome/backend',
volumes=['db-data'], volumes=['db-data'],
depends_on=['monitoring'], depends_on=['monitoring'],
extends=Extends(service_name='frontend'), extends=Extends(service_name='frontend'),
@ -452,7 +438,6 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='backend', name='backend',
image='awesome/backend',
networks=['back-tier','admin'], networks=['back-tier','admin'],
volumes=['db-data'], volumes=['db-data'],
depends_on=['monitoring'], depends_on=['monitoring'],
@ -470,7 +455,6 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='backend', name='backend',
image='awesome/backend',
volumes=['db-data'], volumes=['db-data'],
depends_on=['monitoring'], depends_on=['monitoring'],
extends=Extends(service_name='frontend'), extends=Extends(service_name='frontend'),
@ -523,7 +507,6 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='backend', name='backend',
image='awesome/backend',
volumes=['db-data'], volumes=['db-data'],
depends_on=['monitoring'], depends_on=['monitoring'],
extends=Extends(service_name='frontend'), extends=Extends(service_name='frontend'),
@ -543,7 +526,6 @@ from compose_viz.extends import Extends
), ),
Service( Service(
name='backend', name='backend',
image='awesome/backend',
networks=['back-tier', 'admin'], networks=['back-tier', 'admin'],
volumes=['db-data'], volumes=['db-data'],
depends_on=['monitoring'], depends_on=['monitoring'],