From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 21 Apr 2016 12:03:48 +0000 (+0200)
Subject: Update usage comments.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=1fcdf970934aa6ae5eaa208e81e4738aa1918413;p=virtualization.git

Update usage comments.
---

diff --git a/docker.sh b/docker.sh
index cba3780..b51992a 100755
--- a/docker.sh
+++ b/docker.sh
@@ -2,35 +2,30 @@
 
 #
 # Script to create docker machine:
-# * IPv4 private overlay network (docker overlay)
-# * IPv4 private network with NAT (docker bridge)
+# * IPv4 private overlay network (manually)
+# * IPv4 private network with NAT (docker bridge), TODO: make it optional
 # * IPv6 public network directly (manually, with autoconfiguration)
 #
 # Reqirements:
 #
-# 0) docker from upstream + backports (docker-engine 1.10, linux kernel >= 3.16)
+# 1) docker from upstream + backports (docker-engine 1.10, linux kernel >= 3.16)
 #
 # apt-get install linux-image-amd64 linux-headers-amd64 -t wheezy-backports
 # apt-get install docker-engine bridge-utils -t wheezy-backports
 #
-# 1) zookeeper (public, or port mapped with NAT)
-#
 # 2) for IPv6: IPv6 autoconfiguration enabled
 #
-# 3) /etc/default/docker
-#
-# DOCKER_OPTS="--cluster-advertise=ib0:2376 --cluster-store=zk://hador-c1.ics.muni.cz,hador-c2.ics.muni.cz,hador.ics.muni.cz/docker-hador"
-#
-# DOCKER_OPTS="--bridge=br0 --cluster-advertise=ib0:2376 --cluster-store=zk://hador-c1.ics.muni.cz,hador-c2.ics.muni.cz,hador.ics.muni.cz/docker-hador --default-gateway=147.251.9.1 --fixed-cidr=147.251.9.220/31 --ip-masq=false --iptables=false --ipv6=false"
-#
-# 4) docker overlay network created
+# 3) overlaybr0 bridge with private overlay network (some private VLAN or VXLAN)
 #
-# docker network create -d overlay ics.muni.cz
-#
-# 5) access to kdccesnet.ics.muni.cz,
+# 4) access to kdccesnet.ics.muni.cz,
 #    or create directory config/$HOSTNAME/ssh,
 #    or disable FETCH_SSH_KEYS
 #
+# 5) proper docker image
+#
+#  * name: valtri/docker-server-deb7
+#  * build: https://github.com/valtri/docker-server-deb7
+#
 
 #DOCKER_network='ics.muni.cz'
 DOCKER_network='bridge'