diff --git a/scripts/generators/docker-compose/createComposeFile.py b/scripts/generators/docker-compose/createComposeFile.py index 93cf634..af8489a 100644 --- a/scripts/generators/docker-compose/createComposeFile.py +++ b/scripts/generators/docker-compose/createComposeFile.py @@ -12,7 +12,7 @@ defaultValues = { "imageNamePrefix": "ghcr.io/cisco-open/", - "imageNameSuffix": "latest", + "imageVersion": "latest", "defaultPorts": { "services": 80, # this is different from the "default default" on purpose. "databases": 5432, diff --git a/scripts/generators/docker-compose/docker-compose.j2 b/scripts/generators/docker-compose/docker-compose.j2 index edc2c1b..faae391 100644 --- a/scripts/generators/docker-compose/docker-compose.j2 +++ b/scripts/generators/docker-compose/docker-compose.j2 @@ -3,7 +3,7 @@ services: ## {{ scope }} {%- for name, details in scopeDetails.items() %} {{ name }}: - image: {{ global.imageNamePrefix }}app-simulator-{{ scope }}-{{ details.type }}:{{global.imageNameSuffix }} + image: {{ global.imageNamePrefix }}app-simulator-{{ scope }}-{{ details.type }}:{{global.imageVersion }} {%- if details.port is defined %} ports: - "{{ details.port }}:{{ global.defaultPorts[scope] }}" diff --git a/scripts/generators/docker-compose/tests/test_render_compose_file.py b/scripts/generators/docker-compose/tests/test_render_compose_file.py index 4e49a55..71a5d0f 100644 --- a/scripts/generators/docker-compose/tests/test_render_compose_file.py +++ b/scripts/generators/docker-compose/tests/test_render_compose_file.py @@ -24,7 +24,7 @@ def test_render_compose_file_with_simple_config_and_no_defaults(load_template): result = render_compose_file(load_template, { "global": { "imageNamePrefix": "test/", - "imageNameSuffix": "test" + "imageVersion": "test" }, "services": { "test": { @@ -94,7 +94,7 @@ def test_render_compose_file_with_simple_config_and_defaults(load_template): } }, { "imageNamePrefix": "test/", - "imageNameSuffix": "test" + "imageVersion": "test" }) expected = """ services: @@ -133,7 +133,7 @@ def test_render_compose_file_with_port_config(load_template): result = render_compose_file(load_template, { "global": { "imageNamePrefix": "test/", - "imageNameSuffix": "test", + "imageVersion": "test", "defaultPorts": { "services": 1024, "databases": 5432,