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

Merge a93ce9fc40 into 9fced6721e

Browse source
This commit is contained in:
JonasAlfredsson 2018-10-10 20:17:10 +00:00 • committed by GitHub
commit b42a7f5bc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 147 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
View file

@ -23,6 +23,7 @@ services:
- 8080:80 - 8080:80
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- MYSQL_HOST=db - MYSQL_HOST=db
env_file: env_file:
@ -44,3 +45,4 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:

3
.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
View file

@ -21,6 +21,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- MYSQL_HOST=db - MYSQL_HOST=db
env_file: env_file:
@ -44,6 +45,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
entrypoint: /cron.sh entrypoint: /cron.sh
depends_on: depends_on:
- db - db
@ -52,3 +54,4 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:

2
.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
View file

@ -19,6 +19,7 @@ services:
- 8080:80 - 8080:80
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- MYSQL_HOST=db - MYSQL_HOST=db
env_file: env_file:
@ -29,3 +30,4 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:

2
.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
View file

@ -17,6 +17,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- MYSQL_HOST=db - MYSQL_HOST=db
env_file: env_file:
@ -37,3 +38,4 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:

2
.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
View file

@ -16,6 +16,7 @@ services:
- 8080:80 - 8080:80
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- POSTGRES_HOST=db - POSTGRES_HOST=db
env_file: env_file:
@ -26,3 +27,4 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:

2
.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
View file

@ -14,6 +14,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- POSTGRES_HOST=db - POSTGRES_HOST=db
env_file: env_file:
@ -34,3 +35,4 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:

2
.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
View file

@ -17,6 +17,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- MYSQL_HOST=db - MYSQL_HOST=db
env_file: env_file:
@ -70,6 +71,7 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:
certs: certs:
vhost.d: vhost.d:
html: html:

3
.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
View file

@ -21,6 +21,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- VIRTUAL_HOST= - VIRTUAL_HOST=
- LETSENCRYPT_HOST= - LETSENCRYPT_HOST=
@ -40,6 +41,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
entrypoint: /cron.sh entrypoint: /cron.sh
depends_on: depends_on:
- db - db
@ -77,6 +79,7 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:
certs: certs:
vhost.d: vhost.d:
html: html:

3
.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
View file

@ -21,6 +21,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- MYSQL_HOST=db - MYSQL_HOST=db
env_file: env_file:
@ -49,6 +50,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
entrypoint: /cron.sh entrypoint: /cron.sh
depends_on: depends_on:
- db - db
@ -86,6 +88,7 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:
certs: certs:
vhost.d: vhost.d:
html: html:

2
.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
View file

@ -17,6 +17,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- VIRTUAL_HOST= - VIRTUAL_HOST=
- LETSENCRYPT_HOST= - LETSENCRYPT_HOST=
@ -62,6 +63,7 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:
certs: certs:
vhost.d: vhost.d:
html: html:

2
.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
View file

@ -17,6 +17,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- MYSQL_HOST=db - MYSQL_HOST=db
env_file: env_file:
@ -71,6 +72,7 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:
certs: certs:
vhost.d: vhost.d:
html: html:

2
.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
View file

@ -14,6 +14,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- VIRTUAL_HOST= - VIRTUAL_HOST=
- LETSENCRYPT_HOST= - LETSENCRYPT_HOST=
@ -59,6 +60,7 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:
certs: certs:
vhost.d: vhost.d:
html: html:

2
.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
View file

@ -14,6 +14,7 @@ services:
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html
- nextcloud_data:/var/nc_data
environment: environment:
- POSTGRES_HOST=db - POSTGRES_HOST=db
env_file: env_file:
@ -68,6 +69,7 @@ services:
volumes: volumes:
db: db:
nextcloud: nextcloud:
nextcloud_data:
certs: certs:
vhost.d: vhost.d:
html: html:

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.12RC2 ENV NEXTCLOUD_VERSION 12.0.12RC2

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.12RC2 ENV NEXTCLOUD_VERSION 12.0.12RC2

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.7RC2 ENV NEXTCLOUD_VERSION 13.0.7RC2

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.7RC2 ENV NEXTCLOUD_VERSION 13.0.7RC2

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.2RC2 ENV NEXTCLOUD_VERSION 14.0.2RC2

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.2RC2 ENV NEXTCLOUD_VERSION 14.0.2RC2

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