From: František Dvořák <valtri@civ.zcu.cz>
Date: Wed, 31 Aug 2016 21:36:36 +0000 (+0200)
Subject: Change the base docker image.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=HEAD;p=virtualization.git

Change the base docker image.
---

diff --git a/docker.sh b/docker.sh
index 1e7db76..8186112 100755
--- a/docker.sh
+++ b/docker.sh
@@ -23,15 +23,15 @@
 #
 # 5) proper docker image
 #
-#  * name: valtri/docker-server-deb7
-#  * build: https://github.com/valtri/docker-server-deb7
+#  * name: valtri/docker-server-debian:7
+#  * build: https://github.com/valtri/docker-server-debian
 #
 
 #DOCKER_network='ics.muni.cz'
 DOCKER_network='bridge'
 #DOCKER_network='none'
 FETCH_SSH_KEYS=${FETCH_SSH_KEYS:-'1'}
-IMAGE='valtri/docker-server-deb7'
+IMAGE='valtri/docker-server-debian:7'
 
 # get the first free network device
 devname() {
@@ -114,6 +114,8 @@ if [ -n "${FACTER_ip}" ]; then
   ARGS="${ARGS} --add-host=${FACTER_fqdn}:${FACTER_ip} --add-host=${FACTER_hostname}:${FACTER_ip}"
 fi
 
+docker pull ${IMAGE}
+
 docker run -itd \
   -v ${config_dir}:/docker:ro \
   --cap-add=NET_ADMIN --cap-add=NET_RAW \