Move openssh-server from the base image to the sshd template

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 0e6252a81df7ad51b6e683445eac03faf3680500..9baea654dffdf63d05582d5c86823657545eca4e 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -44,7 +44,6 @@ RUN sed -i -e 's/start -q anacron/anacron -s/' /etc/cron.d/anacron
 RUN sed -i.bak 's/$ModLoad imklog/#$ModLoad imklog/' /etc/rsyslog.conf
 RUN dpkg-divert --local --rename --add /sbin/initctl
 RUN sh -c "test -f /sbin/initctl || ln -s /bin/true /sbin/initctl"
-RUN apt -y install openssh-server
 RUN cd / &&\
     apt -y install runit socat &&\
     mkdir -p /etc/runit/1.d &&\

diff --git a/templates/sshd.template.yml b/templates/sshd.template.yml
index 1de853872c19c6ca584881100c6f252fcfa520fe..b5f3c8fd535560a56a095702e89622db4b278447 100644 (file)
--- a/templates/sshd.template.yml
+++ b/templates/sshd.template.yml
@@ -33,6 +33,7 @@ run:
   - exec:
       hook: sshd
       cmd:
+        - apt -y install openssh-server
         - mkdir -p /var/run/sshd
         - mkdir -p /root/.ssh
         - echo "$ssh_key" >> /root/.ssh/authorized_keys