From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Tue, 17 May 2016 11:28:51 +0000 (+0200)
Subject: Merge branch 'master' of github.com:stevenvanrossem/son-emu
X-Git-Tag: v3.1~122^2~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=4a309a5a30310329472442c11c76be880595a71a;hp=662bb0841ff69d7850ba6815198f0f6c0d9b60b6;p=osm%2Fvim-emu.git

Merge branch 'master' of github.com:stevenvanrossem/son-emu
---

diff --git a/utils/docker/entrypoint.sh b/utils/docker/entrypoint.sh
index 7e72914..1820515 100755
--- a/utils/docker/entrypoint.sh
+++ b/utils/docker/entrypoint.sh
@@ -4,4 +4,9 @@ set -x
 #cp /containernet/util/docker/entrypoint.sh /tmp/x.sh
 #cat /tmp/x.sh | awk 'NR==1{print; print "set -x"} NR!=1' > /conteinernet/util/docker/entrypoint.sh
 
+# this cannot be done from the Dockerfile since we have the socket not mounted during build
+# this image is needed for the monitoring in son-emu
+echo 'Pulling the "google/cadvisor" image ... please wait'
+docker pull 'google/cadvisor'
+
 exec /containernet/util/docker/entrypoint.sh $*