From: stevenvanrossem Date: Tue, 17 May 2016 11:27:19 +0000 (+0200) Subject: pull cadvisor image when son-emu is executed as container X-Git-Tag: v3.1~122^2~3 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=849452347c8953ed38719640801aaf07f161d8ab pull cadvisor image when son-emu is executed as container --- 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 $*