aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-15 19:05:09 +01:00
Code Activity

Make default directory outside webroot

Browse source
This commit is contained in:
jonas 2018-10-06 14:00:28 +02:00
parent 4adf0a9f39
commit d70e8c3ab6
39 changed files with 118 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
12.0-rc/apache/Dockerfile
View file

@ -91,11 +91,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
RUN a2enmod rewrite remoteip ;\ RUN a2enmod rewrite remoteip ;\
{\ {\

2
12.0-rc/apache/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
12.0-rc/fpm-alpine/Dockerfile
View file

@ -80,11 +80,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
ENV NEXTCLOUD_VERSION 12.0.12RC1 ENV NEXTCLOUD_VERSION 12.0.12RC1

2
12.0-rc/fpm-alpine/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
12.0-rc/fpm/Dockerfile
View file

@ -91,11 +91,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
ENV NEXTCLOUD_VERSION 12.0.12RC1 ENV NEXTCLOUD_VERSION 12.0.12RC1

2
12.0-rc/fpm/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
12.0/apache/Dockerfile
View file

@ -91,11 +91,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
RUN a2enmod rewrite remoteip ;\ RUN a2enmod rewrite remoteip ;\
{\ {\

2
12.0/apache/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
12.0/fpm-alpine/Dockerfile
View file

@ -80,11 +80,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
ENV NEXTCLOUD_VERSION 12.0.11 ENV NEXTCLOUD_VERSION 12.0.11

2
12.0/fpm-alpine/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
12.0/fpm/Dockerfile
View file

@ -91,11 +91,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
ENV NEXTCLOUD_VERSION 12.0.11 ENV NEXTCLOUD_VERSION 12.0.11

2
12.0/fpm/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
13.0-rc/apache/Dockerfile
View file

@ -91,11 +91,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
RUN a2enmod rewrite remoteip ;\ RUN a2enmod rewrite remoteip ;\
{\ {\

2
13.0-rc/apache/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
13.0-rc/fpm-alpine/Dockerfile
View file

@ -80,11 +80,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
ENV NEXTCLOUD_VERSION 13.0.7RC1 ENV NEXTCLOUD_VERSION 13.0.7RC1

2
13.0-rc/fpm-alpine/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
13.0-rc/fpm/Dockerfile
View file

@ -91,11 +91,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
ENV NEXTCLOUD_VERSION 13.0.7RC1 ENV NEXTCLOUD_VERSION 13.0.7RC1

2
13.0-rc/fpm/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
13.0/apache/Dockerfile
View file

@ -91,11 +91,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
RUN a2enmod rewrite remoteip ;\ RUN a2enmod rewrite remoteip ;\
{\ {\

2
13.0/apache/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
13.0/fpm-alpine/Dockerfile
View file

@ -80,11 +80,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
ENV NEXTCLOUD_VERSION 13.0.6 ENV NEXTCLOUD_VERSION 13.0.6

2
13.0/fpm-alpine/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
13.0/fpm/Dockerfile
View file

@ -91,11 +91,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
ENV NEXTCLOUD_VERSION 13.0.6 ENV NEXTCLOUD_VERSION 13.0.6

2
13.0/fpm/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
14.0-rc/apache/Dockerfile
View file

@ -91,11 +91,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
RUN a2enmod rewrite remoteip ;\ RUN a2enmod rewrite remoteip ;\
{\ {\

2
14.0-rc/apache/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
14.0-rc/fpm-alpine/Dockerfile
View file

@ -80,11 +80,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
ENV NEXTCLOUD_VERSION 14.0.2RC1 ENV NEXTCLOUD_VERSION 14.0.2RC1

2
14.0-rc/fpm-alpine/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
14.0-rc/fpm/Dockerfile
View file

@ -91,11 +91,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
ENV NEXTCLOUD_VERSION 14.0.2RC1 ENV NEXTCLOUD_VERSION 14.0.2RC1

2
14.0-rc/fpm/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
14.0/apache/Dockerfile
View file

@ -91,11 +91,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
RUN a2enmod rewrite remoteip ;\ RUN a2enmod rewrite remoteip ;\
{\ {\

2
14.0/apache/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
14.0/fpm-alpine/Dockerfile
View file

@ -80,11 +80,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
ENV NEXTCLOUD_VERSION 14.0.1 ENV NEXTCLOUD_VERSION 14.0.1

2
14.0/fpm-alpine/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
14.0/fpm/Dockerfile
View file

@ -91,11 +91,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
ENV NEXTCLOUD_VERSION 14.0.1 ENV NEXTCLOUD_VERSION 14.0.1

2
14.0/fpm/entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false

7
Dockerfile-alpine.template
View file

@ -79,11 +79,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
%%VARIANT_EXTRAS%% %%VARIANT_EXTRAS%%
ENV NEXTCLOUD_VERSION %%VERSION%% ENV NEXTCLOUD_VERSION %%VERSION%%

7
Dockerfile-debian.template
View file

@ -90,11 +90,12 @@ RUN { \
\ \
echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
\ \
mkdir /var/www/data; \ mkdir /var/nc_data; \
chown -R www-data:root /var/www; \ chown -R www-data:root /var/www /var/nc_data; \
chmod -R g=u /var/www chmod -R g=u /var/www /var/nc_data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/nc_data
%%VARIANT_EXTRAS%% %%VARIANT_EXTRAS%%
ENV NEXTCLOUD_VERSION %%VERSION%% ENV NEXTCLOUD_VERSION %%VERSION%%

2
docker-entrypoint.sh
View file

@ -69,6 +69,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/nc_data"'
fi fi
install=false install=false