From 5c86efcd8fad982cee53f0756b122ddf0f3ba2ef Mon Sep 17 00:00:00 2001
From: Thomas E Lackey <telackey@bozemanpass.com>
Date: Tue, 7 Nov 2023 17:35:42 -0600
Subject: [PATCH] fmt

---
 stack_orchestrator/build/build_webapp.py                       | 3 +++
 .../data/container-build/cerc-nextjs-base/build.sh             | 2 +-
 .../data/container-build/cerc-nextjs-base/scripts/find-env.sh  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/stack_orchestrator/build/build_webapp.py b/stack_orchestrator/build/build_webapp.py
index 00b248ad..f4668c5d 100644
--- a/stack_orchestrator/build/build_webapp.py
+++ b/stack_orchestrator/build/build_webapp.py
@@ -56,12 +56,15 @@ def command(ctx, base_container, source_repo, force_rebuild, extra_build_args):
     if not quiet:
         print(f'Dev Root is: {dev_root_path}')
 
+    # First build the base container.
     container_build_env = build_containers.make_container_build_env(dev_root_path, container_build_dir, debug,
                                                                     force_rebuild, extra_build_args)
 
     build_containers.process_container(base_container, container_build_dir, container_build_env, dev_root_path, quiet,
                                        verbose, dry_run, continue_on_error)
 
+
+    # Now build the target webapp.  We use the same build script, but with a different Dockerfile and work dir.
     container_build_env["CERC_CONTAINER_BUILD_WORK_DIR"] = os.path.abspath(source_repo)
     container_build_env["CERC_CONTAINER_BUILD_DOCKERFILE"] = os.path.join(container_build_dir,
                                                                     base_container.replace("/", "-"),
diff --git a/stack_orchestrator/data/container-build/cerc-nextjs-base/build.sh b/stack_orchestrator/data/container-build/cerc-nextjs-base/build.sh
index 1525708d..3cf5f7f4 100755
--- a/stack_orchestrator/data/container-build/cerc-nextjs-base/build.sh
+++ b/stack_orchestrator/data/container-build/cerc-nextjs-base/build.sh
@@ -10,4 +10,4 @@ CERC_CONTAINER_BUILD_WORK_DIR=${CERC_CONTAINER_BUILD_WORK_DIR:-$SCRIPT_DIR}
 CERC_CONTAINER_BUILD_DOCKERFILE=${CERC_CONTAINER_BUILD_DOCKERFILE:-$SCRIPT_DIR/Dockerfile}
 CERC_CONTAINER_BUILD_TAG=${CERC_CONTAINER_BUILD_TAG:-cerc/nextjs-base:local}
 
-docker build -t $CERC_CONTAINER_BUILD_TAG ${build_command_args} -f $CERC_CONTAINER_BUILD_DOCKERFILE $CERC_CONTAINER_BUILD_WORK_DIR
\ No newline at end of file
+docker build -t $CERC_CONTAINER_BUILD_TAG ${build_command_args} -f $CERC_CONTAINER_BUILD_DOCKERFILE $CERC_CONTAINER_BUILD_WORK_DIR
diff --git a/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/find-env.sh b/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/find-env.sh
index 55679a06..0c0e87c9 100755
--- a/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/find-env.sh
+++ b/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/find-env.sh
@@ -21,4 +21,4 @@ for d in $(find . -maxdepth 1 -type d | grep -v '\./\.' | grep '/' | cut -d'/' -
 done
 
 cat $TMPF | sort -u | jq  --raw-input .  | jq --slurp .
-rm -f $TMPF
\ No newline at end of file
+rm -f $TMPF