projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add E-LAN deployment
[osm/vim-emu.git]
/
utils
/
docker
/
entrypoint.sh
diff --git
a/utils/docker/entrypoint.sh
b/utils/docker/entrypoint.sh
index
7e72914
..
4349efd
100755
(executable)
--- 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
#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 $*