From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Mon, 6 Feb 2017 11:54:26 +0000 (+0100)
Subject: Uninstall old docker clients before emulator is installed.
X-Git-Tag: v3.1~48^2~1
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=2f3ad5e01ef4fb8596f2a3697c70b23244572b65

Uninstall old docker clients before emulator is installed.
---

diff --git a/utils/ci/jenkins_entrypoint.sh b/utils/ci/jenkins_entrypoint.sh
index eeff1a0..05331fb 100755
--- 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