Add tzdata to webmails

master
DjVinnii 3 years ago
parent c43f7aef5a
commit a1f0c20583

@ -6,7 +6,7 @@ ONBUILD COPY --from=balenalib/rpi-alpine:3.14 /usr/bin/qemu-arm-static /usr/bin/
# Shared later between dovecot postfix nginx rspamd rainloop and roundloop # Shared later between dovecot postfix nginx rspamd rainloop and roundloop
RUN apk add --no-cache \ RUN apk add --no-cache \
python3 py3-pip \ python3 py3-pip tzdata \
&& pip3 install socrate==0.2.0 && pip3 install socrate==0.2.0
# https://www.rainloop.net/docs/system-requirements/ # https://www.rainloop.net/docs/system-requirements/

@ -9,7 +9,7 @@ FROM ${ARCH}php:7.4-apache as build_other
FROM build_${QEMU} FROM build_${QEMU}
#Shared layer between rainloop and roundcube #Shared layer between rainloop and roundcube
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
python3 curl python3-pip git python3-multidict \ python3 curl python3-pip git python3-multidict tzdata \
&& rm -rf /var/lib/apt/lists \ && rm -rf /var/lib/apt/lists \
&& echo "ServerSignature Off\nServerName roundcube" >> /etc/apache2/apache2.conf \ && echo "ServerSignature Off\nServerName roundcube" >> /etc/apache2/apache2.conf \
&& sed -i 's,CustomLog.*combined$,\0 "'"expr=!(%{HTTP_USER_AGENT}=='health'\&\&(-R '127.0.0.1/8' || -R '::1'))"'",' /etc/apache2/sites-available/000-default.conf && sed -i 's,CustomLog.*combined$,\0 "'"expr=!(%{HTTP_USER_AGENT}=='health'\&\&(-R '127.0.0.1/8' || -R '::1'))"'",' /etc/apache2/sites-available/000-default.conf
@ -21,12 +21,14 @@ ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1
ENV CARDDAV_URL https://github.com/mstilkerich/rcmcarddav/releases/download/v4.1.2/carddav-v4.1.2.tar.gz ENV CARDDAV_URL https://github.com/mstilkerich/rcmcarddav/releases/download/v4.1.2/carddav-v4.1.2.tar.gz
ENV TZ Etc/UTC
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
zlib1g-dev libzip4 libzip-dev libpq-dev \ zlib1g-dev libzip4 libzip-dev libpq-dev \
python3-jinja2 \ python3-jinja2 \
gpg \ gpg \
&& docker-php-ext-install zip pdo_mysql pdo_pgsql \ && docker-php-ext-install zip pdo_mysql pdo_pgsql \
&& echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini \ && echo date.timezone=${TZ} > /usr/local/etc/php/conf.d/timezone.ini \
&& rm -rf /var/www/html/ \ && rm -rf /var/www/html/ \
&& cd /var/www \ && cd /var/www \
&& curl -sL ${ROUNDCUBE_URL} | tar xz \ && curl -sL ${ROUNDCUBE_URL} | tar xz \

Loading…
Cancel
Save