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

Merge 4b9f2bd2e7 into 4adf0a9f39

Browse source
This commit is contained in:
JonasAlfredsson 2018-10-06 13:05:23 +00:00 • committed by GitHub
commit 78ece2ac53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 82 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ services:
ports:
- 8080:80
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- MYSQL_HOST=db
env_file:
@ -35,7 +35,7 @@ services:
build: ./app
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
entrypoint: /cron.sh
depends_on:
- db

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

@ -20,7 +20,7 @@ services:
build: ./app
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- MYSQL_HOST=db
env_file:
@ -35,7 +35,7 @@ services:
ports:
- 8080:80
volumes:
- nextcloud:/var/www/html:ro
- nextcloud:/var/www:ro
depends_on:
- app
@ -43,7 +43,7 @@ services:
build: ./app
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
entrypoint: /cron.sh
depends_on:
- db

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

@ -18,7 +18,7 @@ services:
ports:
- 8080:80
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- MYSQL_HOST=db
env_file:

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

@ -16,7 +16,7 @@ services:
image: nextcloud:fpm
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- MYSQL_HOST=db
env_file:
@ -30,7 +30,7 @@ services:
ports:
- 8080:80
volumes:
- nextcloud:/var/www/html:ro
- nextcloud:/var/www:ro
depends_on:
- app

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

@ -15,7 +15,7 @@ services:
ports:
- 8080:80
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- POSTGRES_HOST=db
env_file:

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

@ -13,7 +13,7 @@ services:
image: nextcloud:fpm
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- POSTGRES_HOST=db
env_file:
@ -27,7 +27,7 @@ services:
ports:
- 8080:80
volumes:
- nextcloud:/var/www/html:ro
- nextcloud:/var/www:ro
depends_on:
- app

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

@ -16,7 +16,7 @@ services:
image: nextcloud:fpm
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- MYSQL_HOST=db
env_file:
@ -28,7 +28,7 @@ services:
build: ./web
restart: always
volumes:
- nextcloud:/var/www/html:ro
- nextcloud:/var/www:ro
environment:
- VIRTUAL_HOST=
depends_on:

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

@ -20,7 +20,7 @@ services:
build: ./app
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- VIRTUAL_HOST=
- LETSENCRYPT_HOST=
@ -39,7 +39,7 @@ services:
build: ./app
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
entrypoint: /cron.sh
depends_on:
- db

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

@ -20,7 +20,7 @@ services:
build: ./app
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- MYSQL_HOST=db
env_file:
@ -33,7 +33,7 @@ services:
build: ./web
restart: always
volumes:
- nextcloud:/var/www/html:ro
- nextcloud:/var/www:ro
environment:
- VIRTUAL_HOST=
- LETSENCRYPT_HOST=
@ -48,7 +48,7 @@ services:
build: ./app
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
entrypoint: /cron.sh
depends_on:
- db

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

@ -16,7 +16,7 @@ services:
image: nextcloud:apache
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- VIRTUAL_HOST=
- LETSENCRYPT_HOST=

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

@ -16,7 +16,7 @@ services:
image: nextcloud:fpm
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- MYSQL_HOST=db
env_file:
@ -28,7 +28,7 @@ services:
build: ./web
restart: always
volumes:
- nextcloud:/var/www/html:ro
- nextcloud:/var/www:ro
environment:
- VIRTUAL_HOST=
- LETSENCRYPT_HOST=

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

@ -13,7 +13,7 @@ services:
image: nextcloud:apache
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- VIRTUAL_HOST=
- LETSENCRYPT_HOST=

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

@ -13,7 +13,7 @@ services:
image: nextcloud:fpm
restart: always
volumes:
- nextcloud:/var/www/html
- nextcloud:/var/www
environment:
- POSTGRES_HOST=db
env_file:
@ -25,7 +25,7 @@ services:
build: ./web
restart: always
volumes:
- nextcloud:/var/www/html:ro
- nextcloud:/var/www:ro
environment:
- VIRTUAL_HOST=
- LETSENCRYPT_HOST=

2
12.0-rc/apache/Dockerfile
View file

@ -95,7 +95,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

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

@ -84,7 +84,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
12.0-rc/fpm/Dockerfile
View file

@ -95,7 +95,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
12.0/apache/Dockerfile
View file

@ -95,7 +95,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
12.0/fpm-alpine/Dockerfile
View file

@ -84,7 +84,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
12.0/fpm/Dockerfile
View file

@ -95,7 +95,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
13.0-rc/apache/Dockerfile
View file

@ -95,7 +95,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

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

@ -84,7 +84,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
13.0-rc/fpm/Dockerfile
View file

@ -95,7 +95,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
13.0/apache/Dockerfile
View file

@ -95,7 +95,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
13.0/fpm-alpine/Dockerfile
View file

@ -84,7 +84,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
13.0/fpm/Dockerfile
View file

@ -95,7 +95,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
14.0-rc/apache/Dockerfile
View file

@ -95,7 +95,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

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

@ -84,7 +84,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
14.0-rc/fpm/Dockerfile
View file

@ -95,7 +95,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
14.0/apache/Dockerfile
View file

@ -95,7 +95,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
14.0/fpm-alpine/Dockerfile
View file

@ -84,7 +84,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
14.0/fpm/Dockerfile
View file

@ -95,7 +95,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false

2
Dockerfile-alpine.template
View file

@ -83,7 +83,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
%%VARIANT_EXTRAS%%
ENV NEXTCLOUD_VERSION %%VERSION%%

2
Dockerfile-debian.template
View file

@ -94,7 +94,7 @@ RUN { \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
VOLUME /var/www/html
VOLUME /var/www
%%VARIANT_EXTRAS%%
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
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
else
install_options=$install_options' --data-dir "/var/www/data"'
fi
install=false