From: František Dvořák <valtri@civ.zcu.cz>
Date: Sat, 27 Feb 2016 23:49:00 +0000 (+0100)
Subject: Remove unused layer from Debian 7/wheezy docker image.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=9a0afc2ea080bc8bcea037787a19393f93315860;p=virtualization.git

Remove unused layer from Debian 7/wheezy docker image.
---

diff --git a/docker/hadoop/README.md b/docker/hadoop/README.md
index fa99c57..26e17ca 100644
--- a/docker/hadoop/README.md
+++ b/docker/hadoop/README.md
@@ -4,14 +4,6 @@ For usage with [virtualization.git](http://scientific.zcu.cz/git/?p=virtualizati
 
 # Layers
 
-## meta
-
-Final image with default OS puppet:
-
-* puppet + thorin2.ics.muni.cz
-* openssh
-* locales
-
 ## puppet
 
 Base image with puppet from puppetlabs:
diff --git a/docker/hadoop/build.sh b/docker/hadoop/build.sh
index ea25ecf..9bd3c90 100755
--- a/docker/hadoop/build.sh
+++ b/docker/hadoop/build.sh
@@ -6,10 +6,6 @@ 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 ..
@@ -25,21 +21,21 @@ set +o xtrace
 
 echo
 for p in ${platforms}; do
-  for t in meta puppet latest; do
+  for t in puppet latest; do
     echo "docker rmi ${user}/hadoop-${p}:${t}"
   done
 done
 
 echo
 for p in ${platforms}; do
-  for t in meta puppet latest; do
+  for t in 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
+  for t in puppet latest; do
     echo "docker push ${user}/hadoop-${p}:${t}"
   done
 done
diff --git a/docker/hadoop/debian7/meta/Dockerfile b/docker/hadoop/debian7/meta/Dockerfile
deleted file mode 100644
index 2f3c510..0000000
--- a/docker/hadoop/debian7/meta/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM debian:7
-MAINTAINER František Dvořák <valtri@civ.zcu.cz>
-
-# ==== system ====
-
-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 -y locales
-
-# ==== ssh ====
-
-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 puppet
-RUN sed -e 's/\(\[main\]\)/\1\nserver=thorin2.ics.muni.cz/' -i /etc/puppet/puppet.conf
-
-# ==== cleanup ====
-
-RUN apt-get clean \
-&& rm -rf /var/lib/apt/lists/*