From 030ad25b78fd5b603ad2ef5e6aa3c5f06a3073e6 Mon Sep 17 00:00:00 2001
From: David Boreham <david@bozemanpass.com>
Date: Thu, 9 Mar 2023 08:30:18 -0700
Subject: [PATCH 1/2] Fix for #212 - exception on non-stack deploy

Former-commit-id: ecc4302c3441981840395b4c68eb03f11861a9dd
---
 app/deploy_system.py               | 5 ++---
 tests/smoke-test/run-smoke-test.sh | 7 +++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/deploy_system.py b/app/deploy_system.py
index 951e375..e1b25f3 100644
--- a/app/deploy_system.py
+++ b/app/deploy_system.py
@@ -185,8 +185,10 @@ def _make_cluster_context(ctx, include, exclude, cluster):
         stack_config = get_parsed_stack_config(ctx.stack)
         # TODO: syntax check the input here
         pods_in_scope = stack_config['pods']
+        cluster_config = stack_config['config'] if 'config' in stack_config else None
     else:
         pods_in_scope = all_pods
+        cluster_config = None
 
     # Convert all pod definitions to v1.1 format
     pods_in_scope = _convert_to_new_format(pods_in_scope)
@@ -223,8 +225,6 @@ def _make_cluster_context(ctx, include, exclude, cluster):
     if ctx.verbose:
         print(f"files: {compose_files}")
 
-    cluster_config = stack_config['config'] if 'config' in stack_config else None
-
     return cluster_context(cluster, compose_files, pre_start_commands, post_start_commands, cluster_config)
 
 
@@ -276,7 +276,6 @@ def _orchestrate_cluster_config(ctx, cluster_config, docker, container_exec_env)
         destination_container: str
         destination_variable: str
 
-
     if cluster_config is not None:
         for container in cluster_config:
             container_config = cluster_config[container]
diff --git a/tests/smoke-test/run-smoke-test.sh b/tests/smoke-test/run-smoke-test.sh
index b4006f0..777c608 100755
--- a/tests/smoke-test/run-smoke-test.sh
+++ b/tests/smoke-test/run-smoke-test.sh
@@ -24,4 +24,11 @@ $TEST_TARGET_SO --stack test deploy-system up
 # TODO: test that we can use the deployed container somehow
 # Clean up
 $TEST_TARGET_SO --stack test deploy-system down
+# Run same test but not using the stack definition
+# Test building the a stack container
+$TEST_TARGET_SO build-containers --include cerc/test-container
+# Deploy the test container
+$TEST_TARGET_SO deploy-system --include test up
+# Clean up
+$TEST_TARGET_SO deploy-system --include test down
 echo "Test passed"

From 139626ef8e4021314741b864f08dc9cbc2b61931 Mon Sep 17 00:00:00 2001
From: David Boreham <david@bozemanpass.com>
Date: Thu, 9 Mar 2023 08:37:20 -0700
Subject: [PATCH 2/2] Update version

Former-commit-id: 01c1230cd109f4aa692a1f64678fe108ca13fae1
---
 app/data/version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/data/version.txt b/app/data/version.txt
index e913786..d716fbf 100644
--- a/app/data/version.txt
+++ b/app/data/version.txt
@@ -1,2 +1,2 @@
 # This file should be re-generated running: scripts/update-version-file.sh script
-v1.0.25-75376d7
+v1.0.26-ee77835