changed docker image tag names in Dockerfiles, added Dockerfile.pdf

radiomix · Mar 20, 2014 · 8c8e82a · 8c8e82a
1 parent 43ed67c
commit 8c8e82a
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 11 deletions.
diff --git a/container_builds/01_openjdk7/Dockerfile b/container_builds/01_openjdk7/Dockerfile
@@ -7,8 +7,8 @@
 #
 
 
-# use our base image debian/fresh
-FROM debian:fresh
+# use our base image debian
+FROM ubuntu
 
 # who we are
 MAINTAINER Michael Klöckner <mkl AT im7 DOT de>

diff --git a/container_builds/01_openjdk7/Dockerfile.pdf b/container_builds/01_openjdk7/Dockerfile.pdf
diff --git a/container_builds/02_jenkins/Dockerfile b/container_builds/02_jenkins/Dockerfile
@@ -7,8 +7,8 @@
 #
 
 
-# use openjdk7 image debian/openjdk7:fresh_openjdk7
-FROM debian/openjdk7:fresh_openjdk7
+# use openjdk7 image ubuntu/openjdk7
+FROM ubuntu/openjdk7
 
 # who we are
 MAINTAINER Michael Klöckner <mkl AT im7 DOT de>

diff --git a/container_builds/02_jenkins/Dockerfile.pdf b/container_builds/02_jenkins/Dockerfile.pdf
diff --git a/container_builds/02_tomcat7/Dockerfile b/container_builds/02_tomcat7/Dockerfile
@@ -7,8 +7,8 @@
 #
 
 
-# use openjdk7 image debian/openjdk7:fresh_openjdk7
-FROM debian/openjdk7:fresh_openjdk7
+# use openjdk7 image ubuntu/openjdk7
+FROM ubuntu/openjdk7
 
 # who we are
 MAINTAINER Michael Klöckner <mkl AT im7 DOT de>

diff --git a/container_builds/02_tomcat7/Dockerfile.pdf b/container_builds/02_tomcat7/Dockerfile.pdf
diff --git a/container_builds/03_install_scala/Dockerfile b/container_builds/03_install_scala/Dockerfile
@@ -7,8 +7,8 @@
 #
 
 
-# use our base image debian/fresh
-FROM debian/tomcat7:fresh_tomcat7
+# use our base image ubuntu/tomcat7
+FROM ubuntu/tomcat7
 
 # who we are
 MAINTAINER Michael Klöckner <mkl AT im7 DOT de>

diff --git a/container_builds/03_install_scala/Dockerfile.pdf b/container_builds/03_install_scala/Dockerfile.pdf
diff --git a/container_builds/04_deploy_scala/Dockerfile b/container_builds/04_deploy_scala/Dockerfile
@@ -8,8 +8,8 @@
 # Server:	http://localhost:8080/lift_blank
 
 
-# use our base image debian/fresh
-FROM debian/scala:fresh_scala
+# use our base image ubuntu/scala
+FROM ubuntu/scala
 
 # who we are
 MAINTAINER Michael Klöckner <mkl AT im7 DOT de>

diff --git a/container_builds/04_deploy_scala/Dockerfile.pdf b/container_builds/04_deploy_scala/Dockerfile.pdf
diff --git a/container_builds/; b/container_builds/;
diff --git a/container_builds/debian/Dockerfile.pdf b/container_builds/debian/Dockerfile.pdf
diff --git a/container_builds/registry/Dockerfile.pdf b/container_builds/registry/Dockerfile.pdf
diff --git a/container_builds/scala/; b/container_builds/scala/;
diff --git a/container_builds/scala/Dockerfile b/container_builds/scala/Dockerfile
@@ -9,7 +9,8 @@
 
 
 # pull the base image off the registry
-FROM registry.im7.de:5000/ubuntu/12.04
+#FROM registry.im7.de:5000/ubuntu/12.04
+FROM ubuntu
 
 # who we are
 MAINTAINER Michael Klöckner <mkl AT im7 DOT de>

diff --git a/container_builds/scala/Dockerfile.pdf b/container_builds/scala/Dockerfile.pdf