Herokufix (#42)

* Fix building a heroku image without variables * 7.0.2
lifechurch · Sep 20, 2019 · 50e48a4 · 50e48a4
1 parent 0bf20fd
commit 50e48a4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Version 7.0.2
+
+Docker Image: quay.io/lifechurch/k8s-deploy-helper:7.0.2
+
+## Bugfixes
+
+* Herokuish build process couldn't build successfully unless at least one environment variable was set.
+
 # Version 7.0.1
 
 Docker Image: quay.io/lifechurch/k8s-deploy-helper:7.0.1

diff --git a/build b/build
@@ -68,7 +68,7 @@ else
     echo "Building env file"
     build_env
     echo "Starting herokuish"
-    dockerrun="docker run -i --name=\"$CI_CONTAINER_NAME\" -v \"$(pwd):/tmp/app:ro\" gliderlabs/herokuish /bin/bash -c \"/bin/herokuish buildpack build && rm /app/.env\""
+    dockerrun="docker run -i --name=\"$CI_CONTAINER_NAME\" -v \"$(pwd):/tmp/app:ro\" gliderlabs/herokuish /bin/bash -c \"/bin/herokuish buildpack build && (rm /app/.env || true)\""
 	eval $dockerrun
     docker commit "$CI_CONTAINER_NAME" "$CI_REGISTRY_IMAGE:$CI_REGISTRY_TAG"
 	docker rm "$CI_CONTAINER_NAME"