RS-353: Use /bin/real-bash in bash-wrapper to enable updating bats …

…to v1.5.0 (#96)

* X-Smart-Branch-Parent: master
* Use real-bash in bash-wrapper. Update bats to v1.5.0
* Simplify cci-export

images/Dockerfile.collector

@@ -7,7 +7,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends lsb-release cma
 ENV ROX_CI_IMAGE=collector-ci-image
 
 COPY ./static-contents/bin/bash-wrapper /bin/
-COPY ./static-contents/etc/bash.env /etc/
 
 RUN \
 	mv /bin/bash /bin/real-bash && \

images/Dockerfile.rox

@@ -83,7 +83,7 @@ RUN set -ex \
 
 # Install bats
 RUN set -ex \
-  && npm install -g bats@1.2.0 [email protected] [email protected] [email protected] \
+  && npm install -g bats@1.5.0 [email protected] [email protected] [email protected] \
   && bats -v
 
 # Install jq

images/static-contents/bin/bash-wrapper

@@ -1,11 +1,28 @@
-#!/bin/sh
+#!/bin/real-bash
+# shellcheck shell=bash
 
-# The second check is necessary because, in subshells of the parent shell,
-# we want to ensure that the original REAL_BASH_ENV is not clobbered.
-if [ -n "${BASH_ENV:-}" ] && [ "${BASH_ENV}" != "/etc/bash.env" ]; then
-  export REAL_BASH_ENV="${BASH_ENV}"
-fi
+# cci-export is a function which can be used to export environment variables in a way that is persistent
+# across CircleCI steps.
+cci-export() {
+	if [ "$#" -ne 2 ]; then
+		echo >&2 "Usage: $0 KEY VALUE"
+		return 1
+	fi
 
-export BASH_ENV="/etc/bash.env"
+	key="$1"
+	value="$2"
+
+	export "${key}=${value}"
+
+	if [[ "$CIRCLECI" == "true" ]]; then
+		if [[ -z "${BASH_ENV}" ]]; then
+			echo >&2 "Env var BASH_ENV not properly set"
+			return 1
+		fi
+		echo "export ${key}=$(printf '%q' "$value")" >> "$BASH_ENV"
+	fi
+}
+
+export -f cci-export
 
 exec /bin/real-bash "$@"