diff --git a/container_builds/01_openjdk7/Dockerfile b/container_builds/01_openjdk7/Dockerfile index 013c9d8..520cb46 100644 --- 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 diff --git a/container_builds/01_openjdk7/Dockerfile.pdf b/container_builds/01_openjdk7/Dockerfile.pdf new file mode 100644 index 0000000..8490ee8 Binary files /dev/null and b/container_builds/01_openjdk7/Dockerfile.pdf differ diff --git a/container_builds/02_jenkins/Dockerfile b/container_builds/02_jenkins/Dockerfile index bcdbfd4..732867e 100644 --- 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 diff --git a/container_builds/02_jenkins/Dockerfile.pdf b/container_builds/02_jenkins/Dockerfile.pdf new file mode 100644 index 0000000..1cd8fed Binary files /dev/null and b/container_builds/02_jenkins/Dockerfile.pdf differ diff --git a/container_builds/02_tomcat7/Dockerfile b/container_builds/02_tomcat7/Dockerfile index be68574..421c2bd 100644 --- 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 diff --git a/container_builds/02_tomcat7/Dockerfile.pdf b/container_builds/02_tomcat7/Dockerfile.pdf new file mode 100644 index 0000000..4f01fbd Binary files /dev/null and b/container_builds/02_tomcat7/Dockerfile.pdf differ diff --git a/container_builds/03_install_scala/Dockerfile b/container_builds/03_install_scala/Dockerfile index e193067..97ce63c 100644 --- 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 diff --git a/container_builds/03_install_scala/Dockerfile.pdf b/container_builds/03_install_scala/Dockerfile.pdf new file mode 100644 index 0000000..7e1e90f Binary files /dev/null and b/container_builds/03_install_scala/Dockerfile.pdf differ diff --git a/container_builds/04_deploy_scala/Dockerfile b/container_builds/04_deploy_scala/Dockerfile index 6eca0ab..efed90d 100644 --- 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 diff --git a/container_builds/04_deploy_scala/Dockerfile.pdf b/container_builds/04_deploy_scala/Dockerfile.pdf new file mode 100644 index 0000000..8944d22 Binary files /dev/null and b/container_builds/04_deploy_scala/Dockerfile.pdf differ diff --git a/container_builds/; b/container_builds/; new file mode 100644 index 0000000..85348fe Binary files /dev/null and b/container_builds/; differ diff --git a/container_builds/debian/Dockerfile.pdf b/container_builds/debian/Dockerfile.pdf new file mode 100644 index 0000000..ca9f2fc Binary files /dev/null and b/container_builds/debian/Dockerfile.pdf differ diff --git a/container_builds/registry/Dockerfile.pdf b/container_builds/registry/Dockerfile.pdf new file mode 100644 index 0000000..6c74f9a Binary files /dev/null and b/container_builds/registry/Dockerfile.pdf differ diff --git a/container_builds/scala/; b/container_builds/scala/; new file mode 100644 index 0000000..515e2fd Binary files /dev/null and b/container_builds/scala/; differ diff --git a/container_builds/scala/Dockerfile b/container_builds/scala/Dockerfile index 05faf61..531fde2 100644 --- 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 diff --git a/container_builds/scala/Dockerfile.pdf b/container_builds/scala/Dockerfile.pdf new file mode 100644 index 0000000..6649ad3 Binary files /dev/null and b/container_builds/scala/Dockerfile.pdf differ