aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-06-17 08:34:48 +02:00
Code Activity

Merge branch 'master' into master

Browse source
This commit is contained in:
kgw4it 2020-08-24 10:27:20 +02:00 • committed by GitHub
commit b47af968a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
284 changed files with 7267 additions and 2098 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.examples/dockerfiles/cron/apache/Dockerfile
View file

@ -5,8 +5,8 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir /var/log/supervisord /var/run/supervisord
COPY supervisord.conf /etc/supervisor/supervisord.conf
COPY supervisord.conf /
ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

4
.examples/dockerfiles/cron/fpm-alpine/Dockerfile
View file

@ -3,8 +3,8 @@ FROM nextcloud:fpm-alpine
RUN apk add --no-cache supervisor \
&& mkdir /var/log/supervisord /var/run/supervisord
COPY supervisord.conf /etc/supervisor/supervisord.conf
COPY supervisord.conf /
ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

4
.examples/dockerfiles/cron/fpm/Dockerfile
View file

@ -5,8 +5,8 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir /var/log/supervisord /var/run/supervisord
COPY supervisord.conf /etc/supervisor/supervisord.conf
COPY supervisord.conf /
ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

12
.examples/dockerfiles/full/apache/Dockerfile
View file

@ -5,7 +5,8 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
ffmpeg \
libmagickcore-6.q16-3-extra \
libmagickcore-6.q16-6-extra \
procps \
smbclient \
supervisor \
# libreoffice \
@ -20,16 +21,13 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \
libbz2-dev \
libc-client-dev \
libgmp3-dev \
libkrb5-dev \
libsmbclient-dev \
; \
\
docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h; \
docker-php-ext-install \
bz2 \
gmp \
imap \
; \
pecl install smbclient; \
@ -55,9 +53,7 @@ RUN mkdir -p \
/var/run/supervisord \
;
COPY supervisord.conf /etc/supervisor/supervisord.conf
COPY supervisord.conf /
ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

9
.examples/dockerfiles/full/fpm-alpine/Dockerfile
View file

@ -5,6 +5,7 @@ RUN set -ex; \
apk add --no-cache \
ffmpeg \
imagemagick \
procps \
samba-client \
supervisor \
# libreoffice \
@ -16,16 +17,14 @@ RUN set -ex; \
$PHPIZE_DEPS \
imap-dev \
krb5-dev \
libressl-dev \
openssl-dev \
samba-dev \
bzip2-dev \
gmp-dev \
; \
\
docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
docker-php-ext-install \
bz2 \
gmp \
imap \
; \
pecl install smbclient; \
@ -45,8 +44,8 @@ RUN mkdir -p \
/var/run/supervisord \
;
COPY supervisord.conf /etc/supervisor/supervisord.conf
COPY supervisord.conf /
ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

10
.examples/dockerfiles/full/fpm/Dockerfile
View file

@ -5,7 +5,8 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
ffmpeg \
libmagickcore-6.q16-3-extra \
libmagickcore-6.q16-6-extra \
procps \
smbclient \
supervisor \
# libreoffice \
@ -20,16 +21,13 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \
libbz2-dev \
libc-client-dev \
libgmp3-dev \
libkrb5-dev \
libsmbclient-dev \
; \
\
docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h; \
docker-php-ext-install \
bz2 \
gmp \
imap \
; \
pecl install smbclient; \
@ -54,8 +52,8 @@ RUN mkdir -p \
/var/run/supervisord \
;
COPY supervisord.conf /etc/supervisor/supervisord.conf
COPY supervisord.conf /
ENV NEXTCLOUD_UPDATE=1
CMD ["/usr/bin/supervisord"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

2
.examples/dockerfiles/imap/fpm-alpine/Dockerfile
View file

@ -6,7 +6,7 @@ RUN set -ex; \
$PHPIZE_DEPS \
imap-dev \
krb5-dev \
libressl-dev \
openssl-dev \
; \
\
docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \

2
.examples/dockerfiles/smb/apache/Dockerfile
View file

@ -1,3 +1,3 @@
FROM nextcloud:apache
RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y procps smbclient && rm -rf /var/lib/apt/lists/*

2
.examples/dockerfiles/smb/fpm-alpine/Dockerfile
View file

@ -1,3 +1,3 @@
FROM nextcloud:fpm-alpine
RUN apk add --no-cache samba-client
RUN apk add --no-cache procps samba-client

2
.examples/dockerfiles/smb/fpm/Dockerfile
View file

@ -1,3 +1,3 @@
FROM nextcloud:fpm
RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y procps smbclient && rm -rf /var/lib/apt/lists/*