whois added to base image.

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index abd2b5fb0b7e16381f95cd69ff3fd0f6217bbc89..5987f3317b3bb71afa698a5059ad06b401c5fd0a 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -32,7 +32,7 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
                        postgresql-9.3 postgresql-client-9.3 \
                        postgresql-contrib-9.3 libpq-dev libreadline-dev \
                        nginx language-pack-en sudo cron anacron \
-                       psmisc rsyslog vim &&\
+                       psmisc rsyslog vim whois &&\
     sed -i -e 's/start -q anacron/anacron -s/' /etc/cron.d/anacron &&\
     sed -i.bak 's/$ModLoad imklog/#$ModLoad imklog/' /etc/rsyslog.conf &&\
     dpkg-divert --local --rename --add /sbin/initctl &&\

diff --git a/samples/standalone.yml b/samples/standalone.yml
index 90ad4a2fd3cb1b673ff6e41e47205a3dc8db0faa..8d6cbe3ffa874ba7a4c5d808afff6de6ccc99b11 100644 (file)
--- a/samples/standalone.yml
+++ b/samples/standalone.yml
@@ -82,7 +82,6 @@ run:
   - exec: echo "Beginning of custom commands"
 
   ## If you want to configure password login for root, uncomment and change:
-  #- exec: apt-get -y install whois # for mkpasswd
   ## Use only one of the following lines:
   #- exec: /usr/sbin/usermod -p 'PASSWORD_HASH' root
   #- exec: /usr/sbin/usermod -p "$(mkpasswd -m sha-256 'RAW_PASSWORD')" root

diff --git a/samples/web_only.yml b/samples/web_only.yml
index f55c465d58c6dd69c8fe71c13db750b503d16ddf..8c61c625b79b2beb6cb38861b1b23273fc09855c 100644 (file)
--- a/samples/web_only.yml
+++ b/samples/web_only.yml
@@ -72,7 +72,6 @@ run:
   - exec: echo "Beginning of custom commands"
 
   ## If you want to configure password login for root, uncomment and change:
-  #- exec: apt-get -y install whois # for mkpasswd
   ## Use only one of the following lines:
   #- exec: /usr/sbin/usermod -p 'PASSWORD_HASH' root
   #- exec: /usr/sbin/usermod -p "$(mkpasswd -m sha-256 'RAW_PASSWORD')" root