projects
/
osm
/
vim-emu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
08f91be
)
Uninstall old docker clients before emulator is installed.
author
peusterm
<manuel.peuster@uni-paderborn.de>
Mon, 6 Feb 2017 11:54:26 +0000
(12:54 +0100)
committer
peusterm
<manuel.peuster@uni-paderborn.de>
Mon, 6 Feb 2017 11:54:26 +0000
(12:54 +0100)
utils/ci/jenkins_entrypoint.sh
patch
|
blob
|
history
diff --git
a/utils/ci/jenkins_entrypoint.sh
b/utils/ci/jenkins_entrypoint.sh
index
eeff1a0
..
05331fb
100755
(executable)
--- a/
utils/ci/jenkins_entrypoint.sh
+++ b/
utils/ci/jenkins_entrypoint.sh
@@
-6,6
+6,9
@@
export DOCKER_HOST="unix:///var/run/docker.sock"
# don't rely on Debian/Ubuntu Docker engine
apt-get remove docker-engine
+# make sure we start from scratch
+pip uninstall docker-py
+pip uninstall docker
set -e
set -x