From e001acce4b22b195ffcf45dc0881b610661e3129 Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@erisindustries.com>
Date: Tue, 11 Apr 2017 19:01:04 +0100
Subject: [PATCH] do not try to cleanup build image on CI
---
circle.yml | 2 +-
tests/build_tool.sh | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/circle.yml b/circle.yml
index 180a517e..ba510936 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,7 +2,7 @@ machine:
environment:
GOPATH: $HOME/.go_workspace
REPO: ${GOPATH}/src/github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}
- DOCKER_VERSION: 1.10.0
+ DOCKER_VERSION: 1.9.1
DOCKER_MACHINE_VERSION: 0.6.0
GO15VENDOREXPERIMENT: 1
post:
diff --git a/tests/build_tool.sh b/tests/build_tool.sh
index 8a155ec2..1d3c2a3e 100755
--- a/tests/build_tool.sh
+++ b/tests/build_tool.sh
@@ -51,4 +51,9 @@ fi
# Cleanup
rm $REPO/target/docker/burrow.dockerartefact
rm $REPO/target/docker/burrow-client.dockerartefact
-docker rmi -f $IMAGE:build
+
+# CircleCI seems to have an issues removing this build, in any case it is not necessary on CI
+if [ ! "$CI" ]
+then
+ docker rmi -f $IMAGE:build
+fi
--
GitLab