Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make monolithic image work when built with buildah #19920

Merged
merged 2 commits into from
Mar 3, 2020
Merged

Make monolithic image work when built with buildah #19920

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41d7c4f
Remove ssh configuration and packages
carbonin Mar 3, 2020
d137874
Move VOLUME commands to the end of the Dockerfile
carbonin Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,9 @@ RUN dnf -y --disableplugin=subscription-manager --setopt=tsflags=nodocs install
memcached \
postgresql-server \
mod_ssl \
openssh-clients \
bdunne marked this conversation as resolved.
Show resolved Hide resolved
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} && \
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} ]