diff --git a/Dockerfile.py b/Dockerfile.py index 0aa1e1b..0db8d92 100755 --- a/Dockerfile.py +++ b/Dockerfile.py @@ -112,8 +112,9 @@ def run_and_stream_command_output(command, args): print(line, end='') build_result.wait() if build_result.returncode != 0: - print(" ::: Error running".format(command)) + print(" ::: Error running {}".format(command)) print(build_result.stderr) + sys.exit(build_resuilt.returncode) def build(docker_repo, arch, args): diff --git a/Dockerfile.sh b/Dockerfile.sh index e48a64f..1446b0f 100755 --- a/Dockerfile.sh +++ b/Dockerfile.sh @@ -1,8 +1,9 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash + # alpine sh only set -eux -./Dockerfile.py -v --arch="${ARCH}" --hub_tag="${ARCH_IMAGE}" +./Dockerfile.py -v --no-cache --arch="${ARCH}" --hub_tag="${ARCH_IMAGE}" # TODO: Add junitxml output and have circleci consume it # 2 parallel max b/c race condition with docker fixture (I think?) py.test -vv -n 2 -k "${ARCH}" ./test/ diff --git a/install.sh b/install.sh index 072539e..3de2723 100644 --- a/install.sh +++ b/install.sh @@ -15,6 +15,7 @@ fi apt-get update apt-get install --no-install-recommends -y curl procps ca-certificates +ln -s `which echo` /usr/local/bin/whiptail curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C / mv /init /s6-init