Create .env file from versioner to avoid hard-coded duplication of po…

…rt numbers

.gitignore

@@ -1,4 +1,9 @@
-/reports
 .DS_Store
+
+.env
+
+reports/*
+reports/.*
+
 snyk.container.scan.json
-snyk.code.scan.json
+snyk.code.scan.json

README.md

@@ -4,7 +4,7 @@
 - An HTTP [Ruby](https://www.ruby-lang.org) [Sinatra](http://sinatrarb.com/) web service, offering a Group/Kata model+persistence API.
 - Demonstrates a [Kosli](https://www.kosli.com/) instrumented [GitHub CI workflow](https://app.kosli.com/cyber-dojo/flows/saver-ci/trails/) 
   deploying, with Continuous Compliance, to [staging](https://app.kosli.com/cyber-dojo/environments/aws-beta/snapshots/) and [production](https://app.kosli.com/cyber-dojo/environments/aws-prod/snapshots/) AWS environments.
-- Uses patterns from https://www.kosli.com/blog/using-kosli-attest-in-github-action-workflows-some-tips/
+- Uses compliance reporting patterns from https://www.kosli.com/blog/using-kosli-attest-in-github-action-workflows-some-tips/
 
 # Development
 
@@ -61,10 +61,10 @@ $ make {metrics_coverage_server|metrics_coverage_client}
 
 ## Probe
 
-- [GET alive?](docs/api.md#get-alive)  
-- [GET ready?](docs/api.md#get-ready)
-- [GET sha](docs/api.md#get-sha)
-- [GET base_image](docs/api.md#get-base-image)
+* [GET alive?](docs/api.md#get-alive)  
+* [GET ready?](docs/api.md#get-ready)
+* [GET sha](docs/api.md#get-sha)
+* [GET base_image](docs/api.md#get-base-image)
 
 # Screenshots
 

bin/lib.sh

@@ -3,17 +3,26 @@ echo_base_image()
 {
   local -r json="$(curl --fail --silent --request GET https://beta.cyber-dojo.org/saver/base_image)"
   echo "${json}" | jq -r '.base_image'
+  #echo cyberdojo/sinatra-base:edb2887@sha256:d40099e71ac46310a58cea1640f5fb842dbaadc148e4973bfb8d2092516370a1
 }
 
 echo_env_vars()
 {
-  # --build-arg ...
+  # Setup port env-vars in .env file using versioner
+  local -r env_filename="${ROOT_DIR}/.env"
+  docker run --rm cyberdojo/versioner | grep PORT > "${env_filename}"
+  echo "CYBER_DOJO_SAVER_CLIENT_PORT=4538" >> "${env_filename}"
+
+  # Get identities of dependent services from versioner
+  # There are none
+
+  # Set env-vars for this repos runner service
   if [[ ! -v CYBER_DOJO_SAVER_BASE_IMAGE ]] ; then
-    echo CYBER_DOJO_SAVER_BASE_IMAGE="$(echo_base_image)"
+    echo CYBER_DOJO_SAVER_BASE_IMAGE="$(echo_base_image)"  # --build-arg
   fi
   if [[ ! -v COMMIT_SHA ]] ; then
     local -r sha="$(cd "${ROOT_DIR}" && git rev-parse HEAD)"
-    echo COMMIT_SHA="${sha}"
+    echo COMMIT_SHA="${sha}"  # --build-arg
   fi
 
   # From versioner ...