Merge branch 'master' into feat-startup

This commit is contained in:
Ionut Filip
2018-10-23 12:51:32 +03:00
committed by GitHub
13 changed files with 46 additions and 11 deletions

View File

@@ -3,7 +3,7 @@ FROM php:7.2-apache
ENV RAINLOOP_URL https://github.com/RainLoop/rainloop-webmail/releases/download/v1.12.1/rainloop-community-1.12.1.zip
RUN apt-get update && apt-get install -y \
unzip python3 python3-jinja2 \
unzip python3 python3-jinja2 curl \
&& rm -rf /var/www/html/ \
&& mkdir /var/www/html \
&& cd /var/www/html \
@@ -29,3 +29,5 @@ EXPOSE 80/tcp
VOLUME ["/data"]
CMD /start.py
HEALTHCHECK CMD curl -f -L http://localhost/ || exit 1

View File

@@ -3,7 +3,7 @@ FROM php:7.2-apache
ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.3.7/roundcubemail-1.3.7-complete.tar.gz
RUN apt-get update && apt-get install -y \
zlib1g-dev python3 \
zlib1g-dev curl python3 \
&& docker-php-ext-install zip \
&& echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini \
&& rm -rf /var/www/html/ \
@@ -19,12 +19,12 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists
COPY php.ini /usr/local/etc/php/conf.d/roundcube.ini
COPY config.inc.php /var/www/html/config/
COPY start.py /start.py
EXPOSE 80/tcp
VOLUME ["/data"]
CMD /start.py
HEALTHCHECK CMD curl -f -L http://localhost/ || exit 1