From ec98fdfc92a4f8b4a04f5c0b45a124edf7463f9a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Wed, 27 Jan 2016 17:55:49 +0100
Subject: [PATCH] Update docker image recipes.

---
 docker/hadoop/README.md                            | 21 ++++++++++++
 docker/hadoop/build.sh                             | 37 ++++++++++++++++++++++
 .../debian7/meta/Dockerfile}                       |  4 +--
 docker/hadoop/debian7/puppet/Dockerfile            | 16 ++++++++++
 .../debian7/puppet/latest/Dockerfile}              | 16 +++-------
 5 files changed, 81 insertions(+), 13 deletions(-)
 create mode 100644 docker/hadoop/README.md
 create mode 100755 docker/hadoop/build.sh
 rename docker/{Dockerfile.meta => hadoop/debian7/meta/Dockerfile} (89%)
 create mode 100644 docker/hadoop/debian7/puppet/Dockerfile
 rename docker/{Dockerfile.puppetlabs => hadoop/debian7/puppet/latest/Dockerfile} (70%)

diff --git a/docker/hadoop/README.md b/docker/hadoop/README.md
new file mode 100644
index 0000000..6118e06
--- /dev/null
+++ b/docker/hadoop/README.md
@@ -0,0 +1,21 @@
+# meta
+
+Final image with default OS puppet:
+
+* puppet + thorin2.ics.muni.cz
+* openssh
+* locales
+
+# puppet
+
+Base image with puppet from puppetlabs:
+
+* puppet
+
+# latest
+
+Final image with puppet from puppetlabs and configured master:
+
+* puppet + myriad7.zcu.cz
+* openssh
+* locales
diff --git a/docker/hadoop/build.sh b/docker/hadoop/build.sh
new file mode 100755
index 0000000..41806c1
--- /dev/null
+++ b/docker/hadoop/build.sh
@@ -0,0 +1,37 @@
+#! /bin/sh -ex
+
+user=valtri
+platforms=debian7
+
+for p in ${platforms}; do
+  cd ${p}
+
+  cd meta
+  docker build -t hadoop-${p}:meta .
+  cd ..
+
+  cd puppet
+  docker build -t hadoop-${p}:puppet .
+  cd ..
+
+  cd puppet/latest
+  docker build -t hadoop-${p}:latest .
+  cd ../..
+
+  cd ..
+done
+
+set +o xtrace
+echo
+for p in ${platforms}; do
+  for t in meta puppet latest; do
+    echo "docker tag hadoop-${p}:${t} ${user}/hadoop-${p}:${t}"
+  done
+done
+echo
+
+for p in ${platforms}; do
+  for t in meta puppet latest; do
+    echo "docker push ${user}/hadoop-${p}:${t}"
+  done
+done
diff --git a/docker/Dockerfile.meta b/docker/hadoop/debian7/meta/Dockerfile
similarity index 89%
rename from docker/Dockerfile.meta
rename to docker/hadoop/debian7/meta/Dockerfile
index 8a30f60..2f3c510 100644
--- a/docker/Dockerfile.meta
+++ b/docker/hadoop/debian7/meta/Dockerfile
@@ -6,7 +6,7 @@ MAINTAINER František Dvořák <valtri@civ.zcu.cz>
 RUN echo 'locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8' | debconf-set-selections
 RUN echo 'locales locales/default_environment_locale select en_US.UTF-8' | debconf-set-selections
 RUN apt-get update \
-&& apt-get install locales
+&& apt-get install -y locales
 
 # ==== ssh ====
 
@@ -16,7 +16,7 @@ RUN apt-get update \
 
 # ==== puppet ====
 
-RUN apt-get update && apt-get install puppet
+RUN apt-get update && apt-get install -y puppet
 RUN sed -e 's/\(\[main\]\)/\1\nserver=thorin2.ics.muni.cz/' -i /etc/puppet/puppet.conf
 
 # ==== cleanup ====
diff --git a/docker/hadoop/debian7/puppet/Dockerfile b/docker/hadoop/debian7/puppet/Dockerfile
new file mode 100644
index 0000000..ebdb6fd
--- /dev/null
+++ b/docker/hadoop/debian7/puppet/Dockerfile
@@ -0,0 +1,16 @@
+FROM debian:7
+MAINTAINER František Dvořák <valtri@civ.zcu.cz>
+
+# ==== puppet ====
+
+RUN apt-get update && apt-get install -y wget
+RUN wget http://apt.puppetlabs.com/puppetlabs-release-wheezy.deb -P /tmp \
+&& dpkg -i /tmp/puppetlabs-release-wheezy.deb \
+&& rm -fv /tmp/puppetlabs-release-wheezy.deb
+
+RUN apt-get update && apt-get install -y puppet
+
+# ==== cleanup ====
+
+RUN apt-get clean \
+&& rm -rf /var/lib/apt/lists/*
diff --git a/docker/Dockerfile.puppetlabs b/docker/hadoop/debian7/puppet/latest/Dockerfile
similarity index 70%
rename from docker/Dockerfile.puppetlabs
rename to docker/hadoop/debian7/puppet/latest/Dockerfile
index 11354ab..0904537 100644
--- a/docker/Dockerfile.puppetlabs
+++ b/docker/hadoop/debian7/puppet/latest/Dockerfile
@@ -1,6 +1,10 @@
-FROM debian:7
+FROM hadoop-debian7:puppet
 MAINTAINER František Dvořák <valtri@civ.zcu.cz>
 
+# ==== puppet ====
+
+RUN sed -e 's/\(\[main\]\)/\1\nserver=myriad7.zcu.cz/' -i /etc/puppet/puppet.conf
+
 # ==== system ====
 
 RUN echo 'locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8' | debconf-set-selections
@@ -14,16 +18,6 @@ RUN apt-get update \
 && apt-get install -y openssh-server \
 && sed -e 's/^#\(GSSAPIAuthentication\).*/\1 yes/' -i /etc/ssh/sshd_config
 
-# ==== puppet ====
-
-RUN apt-get update && apt-get install -y wget
-RUN wget http://apt.puppetlabs.com/puppetlabs-release-wheezy.deb -P /tmp \
-&& dpkg -i /tmp/puppetlabs-release-wheezy.deb \
-&& rm -fv /tmp/puppetlabs-release-wheezy.deb
-
-RUN apt-get update && apt-get install -y puppet
-RUN sed -e 's/\(\[main\]\)/\1\nserver=myriad7.zcu.cz/' -i /etc/puppet/puppet.conf
-
 # ==== cleanup ====
 
 RUN apt-get clean \
-- 
1.8.2.3