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/apache/Dockerfile
View file

@ -109,7 +109,11 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
<<<<<<< HEAD:15.0/apache/Dockerfile
ENV NEXTCLOUD_VERSION 15.0.0
=======
ENV NEXTCLOUD_VERSION 12.0.13
>>>>>>> Add two parameters when Nextcloud is behind a proxy:12.0/apache/Dockerfile
RUN set -ex; \
fetchDeps=" \

14
15.0/apache/entrypoint.sh
View file

@ -127,6 +127,20 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi
fi
if [ -n "${NEXTCLOUD_OVERWRITEHOST+x}" ]; then
echo "setting overwritehost…"
run_as "php /var/www/html/occ config:system:set overwritehost --value=$NEXTCLOUD_OVERWRITEHOST"
fi
if [ -n "${NEXTCLOUD_OVERWRITEPROTOCOL+x}" ]; then
echo "setting overwriteprotocol…"
run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL"
fi
if [ -n "${NEXTCLOUD_OVERWRITEWEBROOT+x}" ]; then
echo "setting overwritewebroot…"
run_as "php /var/www/html/occ config:system:set overwritewebroot --value=$NEXTCLOUD_OVERWRITEWEBROOT"
fi
fi
exec "$@"