Skip to content

Commit f1bb03f

Browse files
arun-guptaarun-gupta
committed
1 parent 87417ed commit f1bb03f

3 files changed

Lines changed: 15 additions & 16 deletions

File tree

‎chapters/docker-basics.adoc‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ Once your Docker host has been created, it then has a number of commands for man
6262
. Upgrade Docker
6363
. Configure the Docker client to talk to a host
6464

65-
You used Docker Machine already during the attendee setup. We won't need it too much further on. But if you need to create hosts, it's a very handy tool to know about. From now on we're mostly going to use the docker client.
65+
Docker Machine was already installed during the attendee setup. We won't need it too much further on. But if you need to create hosts, it's a very handy tool to know about. From now on we're mostly going to use Docker client.
6666

6767
Find out more about the details at the link:https://docs.docker.com/machine/[Docker Machine Website].
6868

69-
Check if docker machine is working:
69+
Open Docker shell, check if docker machine is working:
7070

7171
docker-machine -v
7272

7373
It shows the output similar to the one shown below:
7474

75-
docker-machine version 0.3.0 (0a251fe)
75+
docker-machine version 0.5.0 (04cfa58)
7676

7777
NOTE: The exact version may differ based upon how recently the installation was performed.
7878

@@ -86,7 +86,7 @@ Check if your client is working using the following command:
8686

8787
It shows the output similar to the following:
8888

89-
Docker version 1.7.0, build 0baf609
89+
Docker version 1.9.0, build 76d6bc9
9090

9191
NOTE: The exact version may differ based upon how recently the installation was performed.
9292

@@ -101,11 +101,11 @@ Get a full list of available commands with
101101

102102
docker
103103

104-
A more comprehensive list of commands is also available in <<Common_Docker_Commands>>.
104+
A more commonly used list of commands is available at <<Common_Docker_Commands>>.
105105

106106
### Verify Docker Configuration
107107

108-
Check if your Docker Host is running:
108+
Open Docker shell, check if your Docker Host is running:
109109

110110
docker-machine ls
111111

@@ -114,16 +114,16 @@ You should see the output similar to:
114114
[source, text]
115115
----
116116
NAME ACTIVE DRIVER STATE URL SWARM
117-
lab virtualbox Running tcp://192.168.99.101:2376
117+
default * virtualbox Running tcp://192.168.99.100:2376
118118
----
119119

120120
This machine is shown in "`Running`" state. If the machine state is stopped, start it with:
121121

122-
docker-machine start lab
122+
docker-machine start default
123123

124124
After it is started you can find out IP address of your Docker Host with:
125125

126-
docker-machine ip lab
126+
docker-machine ip default
127127

128128
We already did this during the setup document, remember? So, this is a good chance to check, if you already added this IP to your hosts file.
129129

@@ -141,4 +141,4 @@ PING dockerhost (192.168.99.101): 56 data bytes
141141
64 bytes from 192.168.99.101: icmp_seq=1 ttl=64 time=0.387 ms
142142
----
143143

144-
If it does, you're ready to start with the lab.
144+
If it does, you're ready to start with the workshop.

‎chapters/docker-eclipse.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Make sure to get IP address of the Docker Host as:
4848
+
4949
[source, text]
5050
----
51-
docker-machine ip lab
51+
docker-machine ip default
5252
----
5353
+
5454
Also, make sure to specify the correct directory for `.docker` on your machine.

‎chapters/docker-swarm.adoc‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,13 @@ This shows the output similar to the one below:
130130
----
131131
docker-machine ls
132132
NAME ACTIVE DRIVER STATE URL SWARM
133-
lab virtualbox Running tcp://192.168.99.101:2376
134-
summit2015 virtualbox Running tcp://192.168.99.100:2376
133+
default - virtualbox Running tcp://192.168.99.100:2376
135134
swarm-master * virtualbox Running tcp://192.168.99.102:2376 swarm-master (master)
136-
swarm-node-01 virtualbox Running tcp://192.168.99.103:2376 swarm-master
137-
swarm-node-02 virtualbox Running tcp://192.168.99.104:2376 swarm-master
135+
swarm-node-01 - virtualbox Running tcp://192.168.99.103:2376 swarm-master
136+
swarm-node-02 - virtualbox Running tcp://192.168.99.104:2376 swarm-master
138137
----
139138
+
140-
The machines that are part of the cluster have the cluster’s name in the SWARM column, blank otherwise. For example, "`lab`" and "`summit2015`" are standalone machines where as all other machines are part of the "`swarm-master`" cluster. The Swarm master is also identified by (master) in the SWARM column.
139+
The machines that are part of the cluster have the cluster’s name in the SWARM column, blank otherwise. For example, "`default`" is standalone machines where as all other machines are part of the "`swarm-master`" cluster. The Swarm master is also identified by (master) in the SWARM column.
141140
+
142141
. Connect to the Swarm cluster and find some information about it:
143142

0 commit comments

Comments
 (0)