From: František Dvořák <valtri@civ.zcu.cz>
Date: Sat, 27 Feb 2016 22:42:26 +0000 (+0100)
Subject: Tune Debian 9/stretch docker image.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=5d4d42df9fd8587184dc50ffe8a8e220e582bd20;p=virtualization.git

Tune Debian 9/stretch docker image.
---

diff --git a/docker/hadoop/debian9/Dockerfile b/docker/hadoop/debian9/Dockerfile
index 31d8b88..685949d 100644
--- a/docker/hadoop/debian9/Dockerfile
+++ b/docker/hadoop/debian9/Dockerfile
@@ -3,15 +3,10 @@ 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-jessie.deb -P /tmp \
-&& dpkg -i /tmp/puppetlabs-release-jessie.deb \
-&& rm -fv /tmp/puppetlabs-release-jessie.deb
-
 RUN apt-get update && apt-get install -y puppet
 
 RUN puppet agent --enable
-RUN systemctl mask puppet
+RUN systemctl disable puppet
 
 RUN sed -e 's/\(\[main\]\)/\1\nserver=myriad7.zcu.cz/' -i /etc/puppet/puppet.conf
 
@@ -20,7 +15,7 @@ RUN sed -e 's/\(\[main\]\)/\1\nserver=myriad7.zcu.cz/' -i /etc/puppet/puppet.con
 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 ====
 
diff --git a/docker/hadoop/debian9/docker-entry.sh b/docker/hadoop/debian9/docker-entry.sh
new file mode 100755
index 0000000..008fc8c
--- /dev/null
+++ b/docker/hadoop/debian9/docker-entry.sh
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+if [ -d /docker/ssh ]; then
+  cp -vp /docker/ssh/* /etc/ssh/
+fi
+
+if [ -f /docker/root/.ssh/authorized_keys ]; then
+  mkdir -v /root/.ssh/ 2>/dev/null || :
+  cp -vp /docker/root/.ssh/authorized_keys /root/.ssh/
+fi
+
+if [ -f /docker/root/.k5login ]; then
+  cp -vp /docker/root/.k5login /root/
+fi
+
+exec "$@"