From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Wed, 8 Feb 2017 11:25:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master'
X-Git-Tag: v3.1~45^2~5
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=e0796231bf6fd5b7d09d4a850227be7bc9bbdc6a

Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	utils/docker/Dockerfile
---

e0796231bf6fd5b7d09d4a850227be7bc9bbdc6a
diff --cc utils/docker/entrypoint.sh
index 4349efd,0000000..c67e276
mode 100755,000000..100644
--- a/utils/docker/entrypoint.sh
+++ b/utils/docker/entrypoint.sh
@@@ -1,12 -1,0 +1,12 @@@
 +#! /bin/bash -e
 +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 $*
++exec /containernet/util/docker/entrypoint.sh $*