Add DOCKER_HOST inheriting from the caller, to build environment (#360)

* Add DOCKER_HOST inheriting from the caller, to build environment

* Fix for env var not set

Former-commit-id: 9feff35f53

app/build_containers.py

@@ -95,6 +95,9 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
     container_build_env.update({"CERC_SCRIPT_DEBUG": "true"} if debug else {})
     container_build_env.update({"CERC_FORCE_REBUILD": "true"} if force_rebuild else {})
     container_build_env.update({"CERC_CONTAINER_EXTRA_BUILD_ARGS": extra_build_args} if extra_build_args else {})
+    docker_host_env = os.getenv("DOCKER_HOST")
+    if docker_host_env:
+        container_build_env.update({"DOCKER_HOST": docker_host_env})
 
     def process_container(container):
         if not quiet:

tests/smoke-test/run-smoke-test.sh

@@ -3,6 +3,9 @@ set -e
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
+# Dump environment variables for debugging
+echo "Environment variables:"
+env
 # Basic simple test of stack-orchestrator functionality
 echo "Running stack-orchestrator smoke test"
 # Bit of a hack, test the most recent package
@@ -25,7 +28,7 @@ $TEST_TARGET_SO --stack test build-containers
 # Build one example containers
 $TEST_TARGET_SO build-containers --include cerc/builder-js
 echo "Images in the local registry:"
-docker image ls
+docker image ls -a
 # Deploy the test container
 $TEST_TARGET_SO --stack test deploy-system up
 # TODO: test that we can use the deployed container somehow