Skip to content

Commit 03a22e0

Browse files
committed
cleaning up the flow
1 parent 6175d57 commit 03a22e0

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

developer-tools/java/chapters/ch01-setup.adoc

+8-6
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44

55
This section describes the hardware and software needed for this workshop, and how to configure them. This workshop is designed for a BYOL (Brying Your Own Laptop) style hands-on-lab.
66

7-
== Hardware
7+
== Hardware & Software
88

9-
. Operating System: Mac OS X (10.10+), Windows 10 Pro+, Ubuntu 12+, CentOS 7+
10-
. Memory: At least 4 GB+, preferred 8 GB
9+
. Memory: At least 4 GB+, strongly preferred 8 GB
10+
. Operating System: Mac OS X (10.10.3+), Windows 10 Pro+ 64-bit, Ubuntu 12+, CentOS 7+
11+
12+
An older version of the operating system may be used. The installation instructions would differ slightly in that case and are explained in the next section.
1113

1214
== Install Docker
1315

1416
Docker runs natively on Mac, Windows and Linux. This lab will use https://www.docker.com/community-edition[Docker Community Edition]. Follow the https://www.docker.com/community-edition[instructions] to install Docker.
1517

16-
NOTE: Docker for Mac and Windows have requirements for a fairly recent operating system version. If your machine does not meet these requirements, then you need to install https://www.docker.com/products/docker-toolbox[Docker Toolbox].
18+
NOTE: Docker Community Edition have requirements for a fairly recent operating system version. If your machine does not meet these requirements, then you need to install https://www.docker.com/products/docker-toolbox[Docker Toolbox].
1719

1820
=== Additional components
1921

@@ -23,7 +25,7 @@ Install the following additional components:
2325

2426
=== Docker Toolbox Notes
2527

26-
Skip this section if you are not using Docker Toolbox for Mac or Windows.
28+
Skip this section if you are using Docker Community Edition.
2729

2830
. *Default Docker Machine*: Docker Toolbox creates a Docker Machine named `default`. To make it easier to start/stop the containers, an entry is added into the host mapping table of your operating system.
2931
+
@@ -36,7 +38,7 @@ docker-machine ip default
3638
This will provide the IP address associated with the Docker Machine created by Toolbox.
3739
+
3840
Edit `/etc/hosts` (Mac OS) or `C:\Windows\System32\drivers\etc\hosts` (Windows) and add:
39-
41+
+
4042
[source, text]
4143
----
4244
<IP ADDRESS> dockerhost

0 commit comments

Comments
 (0)