Flatten all run layers into one

This commit is contained in:
Alexander Trost
2017-02-20 18:40:49 +01:00
parent 60122d333a
commit fde883ab1c

View File

@@ -3,22 +3,20 @@ MAINTAINER Alexander Trost <galexrt@googlemail.com>
ENV ZULIP_VERSION="1.5.1" DATA_DIR="/data" ENV ZULIP_VERSION="1.5.1" DATA_DIR="/data"
COPY custom_zulip_files/ /root/custom_zulip
RUN apt-get -q update && \ RUN apt-get -q update && \
apt-get -q dist-upgrade -y && \ apt-get -q dist-upgrade -y && \
mkdir -p "$DATA_DIR" /root/zulip && \ mkdir -p "$DATA_DIR" /root/zulip && \
wget -q "https://www.zulip.org/dist/releases/zulip-server-$ZULIP_VERSION.tar.gz" -O /tmp/zulip-server.tar.gz && \ wget -q "https://www.zulip.org/dist/releases/zulip-server-$ZULIP_VERSION.tar.gz" -O /tmp/zulip-server.tar.gz && \
tar xfz /tmp/zulip-server.tar.gz -C /root/zulip --strip-components=1 && \ tar xfz /tmp/zulip-server.tar.gz -C /root/zulip --strip-components=1 && \
rm -rf /tmp/zulip-server.tar.gz rm -rf /tmp/zulip-server.tar.gz && \
cp -rf /root/custom_zulip/* /root/zulip && \
COPY custom_zulip_files/ /root/custom_zulip
RUN cp -rf /root/custom_zulip/* /root/zulip && \
rm -rf /root/custom_zulip && \ rm -rf /root/custom_zulip && \
PUPPET_CLASSES="zulip::dockervoyager" DEPLOYMENT_TYPE="dockervoyager" \ PUPPET_CLASSES="zulip::dockervoyager" DEPLOYMENT_TYPE="dockervoyager" \
ADDITIONAL_PACKAGES="python-dev python-six python-pbs" VIRTUALENV_NEEDED="no" \ ADDITIONAL_PACKAGES="python-dev python-six python-pbs" VIRTUALENV_NEEDED="yes" \
/root/zulip/scripts/setup/install /root/zulip/scripts/setup/install && \
cp -a /root/zulip/zproject/prod_settings_template.py /etc/zulip/settings.py && \
RUN cp -a /root/zulip/zproject/prod_settings_template.py /etc/zulip/settings.py && \
ln -nsf /etc/zulip/settings.py /root/zulip/zproject/prod_settings.py && \ ln -nsf /etc/zulip/settings.py /root/zulip/zproject/prod_settings.py && \
deploy_path=$(/root/zulip/scripts/lib/zulip_tools.py make_deploy_path) && \ deploy_path=$(/root/zulip/scripts/lib/zulip_tools.py make_deploy_path) && \
mv /root/zulip "$deploy_path" && \ mv /root/zulip "$deploy_path" && \
@@ -28,18 +26,16 @@ RUN cp -a /root/zulip/zproject/prod_settings_template.py /etc/zulip/settings.py
ln -nsf /etc/zulip/settings.py "$deploy_path"/zproject/prod_settings.py && \ ln -nsf /etc/zulip/settings.py "$deploy_path"/zproject/prod_settings.py && \
mkdir -p "$deploy_path"/prod-static/serve && \ mkdir -p "$deploy_path"/prod-static/serve && \
cp -rT "$deploy_path"/prod-static/serve /home/zulip/prod-static && \ cp -rT "$deploy_path"/prod-static/serve /home/zulip/prod-static && \
chown -R zulip:zulip /home/zulip /var/log/zulip /etc/zulip/settings.py chown -R zulip:zulip /home/zulip /var/log/zulip /etc/zulip/settings.py && \
chown zulip:zulip /opt/createZulipAdmin.sh && \
COPY includes/createZulipAdmin.sh /opt/createZulipAdmin.sh
RUN chown zulip:zulip /opt/createZulipAdmin.sh && \
apt-get -qq autoremove --purge -y && \ apt-get -qq autoremove --purge -y && \
apt-get -qq clean && \ apt-get -qq clean && \
rm -rf /root/zulip/puppet/ /var/lib/apt/lists/* /tmp/* /var/tmp/* rm -rf /root/zulip/puppet/ /var/lib/apt/lists/* /tmp/* /var/tmp/*
COPY docker-entrypoint.sh /sbin/entrypoint.sh
COPY setup_files/ /opt/files COPY setup_files/ /opt/files
COPY includes/supervisor/conf.d/zulip_postsetup.conf /etc/supervisor/conf.d/zulip_postsetup.conf COPY includes/supervisor/conf.d/zulip_postsetup.conf /etc/supervisor/conf.d/zulip_postsetup.conf
COPY includes/createZulipAdmin.sh /opt/createZulipAdmin.sh
COPY docker-entrypoint.sh /sbin/entrypoint.sh
VOLUME ["$DATA_DIR"] VOLUME ["$DATA_DIR"]
EXPOSE 80 443 EXPOSE 80 443