Fix #11 - Place Windows instructions as first option

Author: rafabene

chapters/docker-setup.adoc

@@ -9,15 +9,6 @@ This section describes what, how, and where to install the software needed for t
 
 ### Environment
 
-#### DNS Server setup Linux/Mac OS
-
-. Edit `/etc/resolv.conf` (Mac OS or Linux) and leave it as:
-
-[source, text]
-----
-nameserver <INSTRUCTOR IP ADDRESS>
-----
-
 #### DNS Server setup Windows
 
 Go to the adapter settings of your pc's and open the Wireless Network Connection Properties Dialogue. Edit the IPv4 Properties and add the instructor IP (!) as a primary DNS server.
@@ -28,6 +19,16 @@ image::images/dns-setup-3.png["Attendee DNS Setup"]
 
 Switch to the cmd and ping classroom.example.com to verify it works.
 
+#### DNS Server setup Linux/Mac OS
+
+. Edit `/etc/resolv.conf` (Mac OS or Linux) and leave it as:
+
+[source, text]
+----
+nameserver <INSTRUCTOR IP ADDRESS>
+----
+
+
 ### Software
 
 . Java: http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html[Oracle JDK 8u45]
@@ -71,16 +72,16 @@ Docker Machine makes it really easy to create Docker hosts on your computer, on
 
 [source, text]
 ----
-# Mac
-sudo curl -L http://classroom.example.com:8082/downloads/docker/docker-machine_darwin-amd64 -o /usr/local/bin/docker-machine
-sudo chmod +x /usr/local/bin/docker-machine
+#Windows
+curl http://classroom.example.com:8082/downloads/docker/docker-machine.exe
 
 # Linux (Manual install)
 sudo curl -L  http://classroom.example.com:8082/downloads/docker/docker-machine_linux-amd64 -o /usr/local/bin/docker-machine
 sudo chmod +x /usr/local/bin/docker-machine
 
-#Windows
-curl http://classroom.example.com:8082/downloads/docker/docker-machine.exe
+# Mac
+sudo curl -L http://classroom.example.com:8082/downloads/docker/docker-machine_darwin-amd64 -o /usr/local/bin/docker-machine
+sudo chmod +x /usr/local/bin/docker-machine
 ----
 
 ### Create Lab Docker Host
@@ -132,16 +133,16 @@ Docker Client is used to communicate with Docker Host.
 
 [source, text]
 ----
-# Mac
-sudo curl -L http://classroom.example.com:8082/downloads/docker/docker-latest-mac -o /usr/local/bin/docker
-sudo chmod +x /usr/local/bin/docker
+# Windows
+curl -L http://classroom.example.com:8082/downloads/docker/docker-1.8.2.exe -o docker.exe
 
 # Linux
 sudo curl -L http://classroom.example.com:8082/downloads/docker/docker-latest-linux -o /usr/local/bin/docker
 sudo chmod +x /usr/local/bin/docker
 
-# Windows
-curl -L http://classroom.example.com:8082/downloads/docker/docker-1.8.2.exe -o docker.exe
+# Mac
+sudo curl -L http://classroom.example.com:8082/downloads/docker/docker-latest-mac -o /usr/local/bin/docker
+sudo chmod +x /usr/local/bin/docker
 ----
 
 Check if the client is working by executing:

instructor/readme.adoc

@@ -46,18 +46,18 @@ Docker Client allows to interact with Docker Host. Download and install by just
 
 [source, text]
 ----
+#Windows
+Download:
+https://get.docker.com/builds/Windows/x86_64/docker-latest.exe
+https://get.docker.com/builds/Windows/i386/docker-latest.exe
+And save to c:\Users\<username>\docker\docker.exe
+
 #Linux (Fedora only)
 sudo yum install docker-io
 
 # MacOS / Linux (other distros)
 sudo curl -L  https://get.docker.com/builds/`uname -s`/x86_64/docker-latest -o /usr/local/bin/docker
 sudo chmod +x /usr/local/bin/docker
-
-#Windows
-Download:
-https://get.docker.com/builds/Windows/x86_64/docker-latest.exe
-https://get.docker.com/builds/Windows/i386/docker-latest.exe
-And save to c:\Users\<username>\docker\docker.exe
 ----
 
 ## Install Docker Compose
@@ -84,18 +84,18 @@ Install the Docker machine client for your environment: https://github.com/docke
 
 [source, text]
 ----
-# MacOS
-sudo curl -L  https://github.com/docker/machine/releases/download/v0.4.1/docker-machine_darwin-amd64 -o /usr/local/bin/docker-machine
-sudo chmod +x /usr/local/bin/docker-machine
+# Windows
+Download:
+https://github.com/docker/machine/releases/download/v0.4.1/docker-machine_windows-amd64.exe
+And save to c:\Users\<username>\docker\docker-machine.exe
 
 # Linux
 sudo curl -L https://github.com/docker/machine/releases/download/v0.4.1/docker-machine_linux-amd64 -o /usr/local/bin/docker-machine
 sudo chmod +x /usr/local/bin/docker-machine
 
-# Windows
-Download:
-https://github.com/docker/machine/releases/download/v0.4.1/docker-machine_windows-amd64.exe
-And save to c:\Users\<username>\docker\docker-machine.exe
+# MacOS
+sudo curl -L  https://github.com/docker/machine/releases/download/v0.4.1/docker-machine_darwin-amd64 -o /usr/local/bin/docker-machine
+sudo chmod +x /usr/local/bin/docker-machine
 ----
 
 For Windows, make sure to add `c:\Users\<username>\docker` to your `%PATH%` variable. This was already done for Linux / MacOs when you downloaded `docker-machine` script to `/usr/local/bin/docker-machine`.