From 0d83f24661e225600942bcb034b03b2e6a389e0a Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Wed, 17 Jun 2015 15:32:41 +0100 Subject: [PATCH] Prefer -ti to -t -i in updated examples --- README.md | 4 ++-- site/features.md | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 68a928a1..72d45ae6 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ On `$HOST1` run host1$ weave launch host1$ weave launch-dns - host1$ weave run --name h1c1 -t -i ubuntu + host1$ weave run --name h1c1 -ti ubuntu The first two lines start the weave router and DNS, each inside their own container - this needs to be done once per host. Whilst the @@ -81,7 +81,7 @@ Next we repeat similar steps on `$HOST2`... host2$ weave launch $HOST1 host2$ weave launch-dns - host2$ weave run --name h2c1 -t -i ubuntu + host2$ weave run --name h2c1 -ti ubuntu The only difference, apart from the name of the application container, is that we tell our weave that it should peer with the weave on diff --git a/site/features.md b/site/features.md index 4cc63609..3e12c9ac 100644 --- a/site/features.md +++ b/site/features.md @@ -67,11 +67,11 @@ notation](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notat On $HOST1: - host1$ C=$(weave run 10.2.1.1/24 -t -i ubuntu) + host1$ C=$(weave run 10.2.1.1/24 -ti ubuntu) And $HOST2: - host2$ C=$(weave run 10.2.1.2/24 -t -i ubuntu) + host2$ C=$(weave run 10.2.1.2/24 -ti ubuntu) Then on $HOST1... @@ -117,13 +117,13 @@ This delegates the entire 10.2.0.0/16 subnet to weave, and instructs it to allocate from 10.2.1.0/24 within that if no specific subnet is specified. Now we can launch some containers in the default subnet: - host1$ weave run --name h1c1 -t -i ubuntu - host2$ weave run --name h2c1 -t -i ubuntu + host1$ weave run --name h1c1 -ti ubuntu + host2$ weave run --name h2c1 -ti ubuntu And some more containers in a different subnet: - host1$ weave run net:10.2.2.0/24 --name h1c2 -t -i ubuntu - host2$ weave run net:10.2.2.0.24 --name h2c2 -t -i ubuntu + host1$ weave run net:10.2.2.0/24 --name h1c2 -ti ubuntu + host2$ weave run net:10.2.2.0.24 --name h2c2 -ti ubuntu A quick 'ping' test in the containers confirms that they can talk to each other but not the containers of our first application... @@ -153,7 +153,7 @@ well-known technique from the 'on metal' days to containers. If desired, a container can be attached to multiple subnets when it is started: - host1$ weave run net:default net:10.2.2.0/24 -t -i ubuntu + host1$ weave run net:default net:10.2.2.0/24 -ti ubuntu NB: By default docker permits communication between containers on the same host, via their docker-assigned IP addresses. For complete