Sync daily Dockerfile with 19.0

This commit is contained in:
hoellen 2020-06-20 10:26:07 +02:00
parent eda8a6eee2
commit 832c073d5f
2 changed files with 5 additions and 4 deletions

View File

@ -35,7 +35,7 @@ RUN apk -U upgrade \
ca-certificates \ ca-certificates \
libsmbclient \ libsmbclient \
imagemagick-libs \ imagemagick-libs \
ffmpeg-libs \ ffmpeg \
tzdata \ tzdata \
&& pecl channel-update pecl.php.net \ && pecl channel-update pecl.php.net \
&& pecl install \ && pecl install \

View File

@ -1,4 +1,4 @@
FROM hoellen/nginx-php:7.3 FROM hoellen/nginx-php:7.4
ENV UID=991 GID=991 \ ENV UID=991 GID=991 \
UPLOAD_MAX_SIZE=10G \ UPLOAD_MAX_SIZE=10G \
@ -32,6 +32,7 @@ RUN apk -U upgrade \
ca-certificates \ ca-certificates \
libsmbclient \ libsmbclient \
imagemagick-libs \ imagemagick-libs \
ffmpeg \
tzdata \ tzdata \
&& pecl channel-update pecl.php.net \ && pecl channel-update pecl.php.net \
&& pecl install \ && pecl install \
@ -53,13 +54,13 @@ RUN apk -U upgrade \
&& tar xjf latest.tar.bz2 --strip 1 -C /nextcloud \ && tar xjf latest.tar.bz2 --strip 1 -C /nextcloud \
&& update-ca-certificates \ && update-ca-certificates \
&& apk del build-dependencies \ && apk del build-dependencies \
&& rm -rf /var/cache/apk/* /tmp/* && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
COPY rootfs / COPY rootfs /
RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/* RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
VOLUME /data /config /apps2 /nextcloud/themes /php/session VOLUME /data /config /apps2 /nextcloud/themes
EXPOSE 8888 EXPOSE 8888