Skip to content

Commit

Permalink
Merge pull request #19920 from carbonin/update_dockerfile
Browse files Browse the repository at this point in the history
Make monolithic image work when built with buildah

(cherry picked from commit d013803)
  • Loading branch information
bdunne authored and simaishi committed Mar 12, 2020
1 parent 21b6d9c commit 4aba85c
Showing 1 changed file with 4 additions and 16 deletions.
20 changes: 4 additions & 16 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,9 @@ RUN yum -y install --setopt=tsflags=nodocs \
memcached \
postgresql-server \
mod_ssl \
openssh-clients \
openssh-server \
&& \
yum 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} && \
Expand All @@ -34,6 +19,9 @@ RUN ${APPLIANCE_ROOT}/setup && \
## Overwrite entrypoint from pods repo
COPY docker-assets/entrypoint /usr/local/bin

EXPOSE 443 22
EXPOSE 443

LABEL name="manageiq"

VOLUME [ "/var/lib/pgsql/data" ]
VOLUME [ ${APP_ROOT} ]

0 comments on commit 4aba85c

Please sign in to comment.