From 41d7c4fbffabea589c8ae31abf17cfd140e39d0b Mon Sep 17 00:00:00 2001
From: Nick Carboni <ncarboni@redhat.com>
Date: Tue, 3 Mar 2020 15:22:59 -0500
Subject: [PATCH 1/2] Remove ssh configuration and packages

---
 Dockerfile | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a94f57090bc..bb6b68eccee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,24 +8,12 @@ RUN dnf -y --disableplugin=subscription-manager --setopt=tsflags=nodocs install
       memcached               \
       postgresql-server       \
       mod_ssl                 \
-      openssh-clients         \
-      openssh-server          \
       &&                      \
     dnf clean all
 
 VOLUME [ "/var/lib/pgsql/data" ]
 VOLUME [ ${APP_ROOT} ]
 
-# Initialize SSH
-RUN ssh-keygen -q -t dsa -N '' -f /etc/ssh/ssh_host_dsa_key && \
-    ssh-keygen -q -t rsa -N '' -f /etc/ssh/ssh_host_rsa_key && \
-    ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
-    cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \
-    for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done && \
-    echo "root:smartvm" | chpasswd && \
-    chmod 700 /root/.ssh && \
-    chmod 600 /root/.ssh/*
-
 ## Copy/link the appliance files again so that we get ssl
 RUN ${APPLIANCE_ROOT}/setup && \
     mv /etc/httpd/conf.d/ssl.conf{,.orig} && \
@@ -34,6 +22,6 @@ RUN ${APPLIANCE_ROOT}/setup && \
 ## Overwrite entrypoint from pods repo
 COPY docker-assets/entrypoint /usr/local/bin
 
-EXPOSE 443 22
+EXPOSE 443
 
 LABEL name="manageiq"

From d137874b03027d529b4b4feadb133d710faff406 Mon Sep 17 00:00:00 2001
From: Nick Carboni <ncarboni@redhat.com>
Date: Tue, 3 Mar 2020 15:23:21 -0500
Subject: [PATCH 2/2] Move VOLUME commands to the end of the Dockerfile

This avoids https://github.com/containers/buildah/issues/2202
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bb6b68eccee..16889ea7e41 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,9 +11,6 @@ RUN dnf -y --disableplugin=subscription-manager --setopt=tsflags=nodocs install
       &&                      \
     dnf clean all
 
-VOLUME [ "/var/lib/pgsql/data" ]
-VOLUME [ ${APP_ROOT} ]
-
 ## Copy/link the appliance files again so that we get ssl
 RUN ${APPLIANCE_ROOT}/setup && \
     mv /etc/httpd/conf.d/ssl.conf{,.orig} && \
@@ -25,3 +22,6 @@ COPY docker-assets/entrypoint /usr/local/bin
 EXPOSE 443
 
 LABEL name="manageiq"
+
+VOLUME [ "/var/lib/pgsql/data" ]
+VOLUME [ ${APP_ROOT} ]