Skip to content

Commit

Permalink
Merge branch 'fix-deploy-script' of https://github.com/racker/fleece
Browse files Browse the repository at this point in the history
…into fix-deploy-script
  • Loading branch information
Bruce Stringer committed Nov 15, 2017
2 parents 5a3f38f + ed73f57 commit fb6abaa
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion fleece/cli/build/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,15 @@ def build(args):
for line in container.logs(stream=True, follow=True):
sys.stdout.write(line.decode('utf-8'))
exit_code = container.wait()
container.remove()
try:
container.remove()
except docker.errors.APIError as e:
if 'Failed to destroy btrfs snapshot' in str(e):
# circle-ci builds do not get permissions that allow them to remove
# containers, see https://circleci.com/docs/1.0/docker-btrfs-error/
pass
else:
raise

if exit_code:
print('Error: build ended with exit code = {}.'.format(exit_code))
Expand Down

0 comments on commit fb6abaa

Please sign in to comment.