git://scientific.zcu.cz
/
virtualization.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
501f118
)
Change the base docker image.
master
author
František Dvořák
<valtri@civ.zcu.cz>
Wed, 31 Aug 2016 21:36:36 +0000
(23:36 +0200)
committer
František Dvořák
<valtri@civ.zcu.cz>
Wed, 31 Aug 2016 21:36:36 +0000
(23:36 +0200)
docker.sh
patch
|
blob
|
blame
|
history
diff --git
a/docker.sh
b/docker.sh
index
1e7db76
..
8186112
100755
(executable)
--- a/
docker.sh
+++ b/
docker.sh
@@
-23,15
+23,15
@@
#
# 5) proper docker image
#
#
# 5) proper docker image
#
-# * name: valtri/docker-server-deb7
-# * build: https://github.com/valtri/docker-server-deb
7
+# * name: valtri/docker-server-deb
ian:
7
+# * build: https://github.com/valtri/docker-server-deb
ian
#
#DOCKER_network='ics.muni.cz'
DOCKER_network='bridge'
#DOCKER_network='none'
FETCH_SSH_KEYS=${FETCH_SSH_KEYS:-'1'}
#
#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-deb
ian:
7'
# get the first free network device
devname() {
# 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
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 \
docker run -itd \
-v ${config_dir}:/docker:ro \
--cap-add=NET_ADMIN --cap-add=NET_RAW \