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

Rebase

Browse source
This commit is contained in:
naramski 2018-12-14 09:52:46 +01:00
parent 31d7dedda9
commit 71a8f0ef64
14 changed files with 158 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
15.0/fpm/Dockerfile
View file

@ -101,7 +101,11 @@ RUN { \
VOLUME /var/www/html
<<<<<<< HEAD:15.0/fpm/Dockerfile
ENV NEXTCLOUD_VERSION 15.0.0
=======
ENV NEXTCLOUD_VERSION 12.0.13
>>>>>>> Add two parameters when Nextcloud is behind a proxy:12.0/fpm/Dockerfile
RUN set -ex; \
fetchDeps=" \