Skip to content

Commit aa22e58

Browse files
rafabenerafabene
committed
Fix arun-gupta#65 Update Docker to and boot2docker to 1.7
1 parent 87ee5ee commit aa22e58

6 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎chapters/docker-setup.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ curl -L http://classroom.example.com:8082/downloads/docker-latest-linux > /usr/
115115
chmod +x /usr/local/bin/docker
116116
117117
#Windows
118-
curl http://classroom.example.com:8082/docker-1.6.0.exe
118+
curl http://classroom.example.com:8082/docker-1.7.0.exe
119119
----
120120

121121
On Windows rename the file to `C:\docker\docker.exe`.
@@ -148,7 +148,7 @@ Edit `/etc/hosts` (Mac OS or Linux) or `C:\Windows\System32\drivers\etc\hosts` (
148148

149149
#### Kubernetes
150150

151-
. Download Kubernetes (0.18.1) from http://classroom.example.com:8082/downloads/kubernetes.tar.gz
151+
. Download Kubernetes (0.19.3) from http://classroom.example.com:8082/downloads/kubernetes.tar.gz
152152
. Install it by clicking on the archive.
153153

154154
#### WildFly

‎instructor/docker-compose.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
registryv1:
22
image: registry:0.9.1
33
ports:
4-
- "5000:5000"
4+
- "5000:5000"
55
environment:
6-
- DISABLE_TOKEN_AUTH=true
7-
- SETTINGS_FLAVOR=local
8-
- SEARCH_BACKEND=sqlalchemy
9-
- STORAGE_PATH=/var/lib/registry
6+
- DISABLE_TOKEN_AUTH=true
7+
- SETTINGS_FLAVOR=local
8+
- SEARCH_BACKEND=sqlalchemy
9+
- STORAGE_PATH=/var/lib/registry
1010
volumes:
1111
- /srv/docker/registry_v1:/var/lib/registry
1212
restart: always

‎instructor/dockerfiles/lab-httpd-server/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN chmod 644 /var/www/html/downloads/jboss-devstudio-9.0.0.Beta2-v20150609-1026
2121
RUN curl -L http://download.jboss.org/wildfly/8.2.0.Final/wildfly-8.2.0.Final.zip -o wildfly-8.2.0.Final.zip
2222

2323
#Get Boot2docker 1.6.2
24-
RUN curl -L https://github.com/boot2docker/boot2docker/releases/download/v1.6.2/boot2docker.iso -o boot2docker.iso
24+
RUN curl -L https://github.com/boot2docker/boot2docker/releases/download/v1.7.0/boot2docker.iso -o boot2docker.iso
2525

2626
#Get VirtualBox for MAC
2727
RUN curl -L http://download.virtualbox.org/virtualbox/4.3.26/VirtualBox-4.3.26-98988-OSX.dmg -o VirtualBox-4.3.26-98988-OSX.dmg
@@ -36,13 +36,13 @@ RUN curl -L http://download.virtualbox.org/virtualbox/4.3.26/VirtualBox-4.3.26-9
3636
RUN curl -L https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20150319/Git-1.9.5-preview20150319.exe -o Git-1.9.5-preview20150319.exe
3737

3838
#Get Docker Machine Windows
39-
RUN curl -L https://github.com/docker/machine/releases/download/v0.3.0-rc3/docker-machine_windows-amd64.exe -o docker-machine_windows-amd64.exe
39+
RUN curl -L https://github.com/docker/machine/releases/download/v0.3.0/docker-machine_windows-amd64.exe -o docker-machine_windows-amd64.exe
4040

4141
#Get Docker Machine MacOS
42-
RUN curl -L https://github.com/docker/machine/releases/download/v0.3.0-rc3/docker-machine_darwin-amd64 -o docker-machine_darwin-amd64
42+
RUN curl -L https://github.com/docker/machine/releases/download/v0.3.0/docker-machine_darwin-amd64 -o docker-machine_darwin-amd64
4343

4444
#Get Docker Machine Linux
45-
RUN curl -L https://github.com/docker/machine/releases/download/v0.3.0-rc3/docker-machine_linux-amd64 -o docker-machine_linux-amd64
45+
RUN curl -L https://github.com/docker/machine/releases/download/v0.3.0/docker-machine_linux-amd64 -o docker-machine_linux-amd64
4646

4747
#Get Docker Client Mac OS
4848
RUN curl -L https://get.docker.com/builds/Darwin/x86_64/docker-latest -o docker-latest-mac
@@ -51,7 +51,7 @@ RUN curl -L https://get.docker.com/builds/Darwin/x86_64/docker-latest -o docker-
5151
RUN curl -L https://get.docker.com/builds/Linux/x86_64/docker-latest -o docker-latest-linux
5252

5353
#Get Docker Client Windows
54-
RUN curl -L http://test.docker.com.s3.amazonaws.com/builds/Windows/x86_64/docker-1.6.0.exe -o docker-1.6.0.exe
54+
RUN curl -L http://test.docker.com.s3.amazonaws.com/builds/Windows/x86_64/docker-1.7.0.exe -o docker-1.7.0.exe
5555

5656
#Get Maven binaries
5757
RUN curl -L http://apache.mirrors.tds.net/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.zip -o apache-maven-3.3.3-bin.zip
@@ -70,7 +70,7 @@ RUN curl -L https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.deb -o
7070
RUN curl -L https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.rpm -o vagrant_1.7.2_x86_64.rpm
7171

7272
#Get Kubernetes
73-
RUN curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.18.1/kubernetes.tar.gz -o kubernetes.tar.gz
73+
RUN curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.19.3/kubernetes.tar.gz -o kubernetes.tar.gz
7474

7575
#Add other files to downloads
7676
ADD downloads/lab-settings.xml /var/www/html/downloads/

‎instructor/dockerfiles/lab-httpd-server/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ <h4 id="_docker_client">2.2.10. Docker Client</h4>
880880
chmod +x /usr/local/bin/docker
881881

882882
#Windows
883-
curl http://classroom.example.com:8082/docker-1.6.0.exe</code></pre>
883+
curl http://classroom.example.com:8082/docker-1.7.0.exe</code></pre>
884884
</div>
885885
</div>
886886
<div class="paragraph">
@@ -927,7 +927,7 @@ <h4 id="_kubernetes">2.2.12. Kubernetes</h4>
927927
<div class="olist arabic">
928928
<ol class="arabic">
929929
<li>
930-
<p>Download Kubernetes (0.18.1) from <a href="http://classroom.example.com:8082/downloads/kubernetes.tar.gz" class="bare">http://classroom.example.com:8082/downloads/kubernetes.tar.gz</a></p>
930+
<p>Download Kubernetes (0.19.3) from <a href="http://classroom.example.com:8082/downloads/kubernetes.tar.gz" class="bare">http://classroom.example.com:8082/downloads/kubernetes.tar.gz</a></p>
931931
</li>
932932
<li>
933933
<p>Install it by clicking on the archive.</p>
@@ -2040,7 +2040,7 @@ <h3 id="_start_database_server">7.2. Start Database Server</h3>
20402040
<div class="content">
20412041
<pre class="CodeRay highlight"><code data-lang="text">&gt; docker ps
20422042
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
2043-
047bab6a86fe 192.168.99.100:5000/postgres:latest &quot;/docker-entrypoint. 42 seconds ago Up 3 seconds 0.0.0.0:5432-&gt;5432/tcp db</code></pre>
2043+
047bab6a86fe classroom.example.com:5000/postgres:latest &quot;/docker-entrypoint. 42 seconds ago Up 3 seconds 0.0.0.0:5432-&gt;5432/tcp db</code></pre>
20442044
</div>
20452045
</div>
20462046
<div class="paragraph">

‎instructor/images/registry-default-output.png‎

659 Bytes
Loading

‎instructor/readme.adoc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Learn more about the tool on link:https://docs.docker.com/compose/[Docker Compos
6666
[source, text]
6767
----
6868
# Linux / MacOS
69-
curl -L https://github.com/docker/compose/releases/download/1.3.0rc3/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
69+
curl -L https://github.com/docker/compose/releases/download/1.3.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
7070
chmod +x /usr/local/bin/docker-compose
7171
----
7272

@@ -79,16 +79,16 @@ Install the Docker machine client for your environment: https://github.com/docke
7979
[source, text]
8080
----
8181
# MacOS
82-
curl -L https://github.com/docker/machine/releases/download/v0.3.0-rc3/docker-machine_darwin-amd64 > /usr/local/bin/docker-machine
82+
curl -L https://github.com/docker/machine/releases/download/v0.3.0/docker-machine_darwin-amd64 > /usr/local/bin/docker-machine
8383
chmod +x /usr/local/bin/docker-machine
8484
8585
# Linux
86-
curl -L https://github.com/docker/machine/releases/download/v0.3.0-rc3/docker-machine_linux-amd64 > /usr/local/bin/docker-machine
86+
curl -L https://github.com/docker/machine/releases/download/v0.3.0/docker-machine_linux-amd64 > /usr/local/bin/docker-machine
8787
chmod +x /usr/local/bin/docker-machine
8888
8989
# Windows
9090
Download:
91-
https://github.com/docker/machine/releases/download/v0.3.0-rc3/docker-machine_windows-amd64.exe
91+
https://github.com/docker/machine/releases/download/v0.3.0/docker-machine_windows-amd64.exe
9292
And save to c:\Users\<username>\docker\docker-machine.exe
9393
----
9494

@@ -169,7 +169,7 @@ nameserver <INSTRUCTOR_IP>
169169
+
170170
[source, text]
171171
----
172-
docker-machine create --driver=virtualbox --virtualbox-memory=4096 --engine-insecure-registry=classroom.example.com:5000 instructor-machine
172+
docker-machine create --driver=virtualbox --virtualbox-memory=4096 --virtualbox-boot2docker-url=https://github.com/boot2docker/boot2docker/releases/download/v1.7.0/boot2docker.iso --engine-insecure-registry=classroom.example.com:5000 instructor-machine
173173
----
174174
175175
+
@@ -256,7 +256,7 @@ a041b58ceff1 instructor_httpserver:latest "/run-apache.sh" 5 minu
256256
257257
Test if the servers are running:
258258
259-
. Docker Registry [http://localhost:5000/v2/]
259+
. Docker Registry [http://localhost:5000/]
260260
+
261261
image::images/registry-default-output.png[]
262262
+

0 commit comments

Comments
 (0)