aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-23 22:46:10 +01:00
Code Activity

Support SELinux in docker-compose.yml examples (fix #324) (#1957)

Browse source 
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
This commit is contained in:
J0WI 2023-03-28 16:05:53 +00:00 • committed by GitHub
parent 30bb621341
commit 3eb80c52b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 64 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ services:
command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
restart: always restart: always
volumes: volumes:
- db:/var/lib/mysql - db:/var/lib/mysql:Z
environment: environment:
- MYSQL_ROOT_PASSWORD= - MYSQL_ROOT_PASSWORD=
- MARIADB_AUTO_UPGRADE=1 - MARIADB_AUTO_UPGRADE=1
@ -24,7 +24,7 @@ services:
ports: ports:
- 127.0.0.1:8080:80 - 127.0.0.1:8080:80
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
environment: environment:
- MYSQL_HOST=db - MYSQL_HOST=db
- REDIS_HOST=redis - REDIS_HOST=redis
@ -38,7 +38,7 @@ services:
image: nextcloud:apache image: nextcloud:apache
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
entrypoint: /cron.sh entrypoint: /cron.sh
depends_on: depends_on:
- db - db

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

@ -6,7 +6,7 @@ services:
command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
restart: always restart: always
volumes: volumes:
- db:/var/lib/mysql - db:/var/lib/mysql:Z
environment: environment:
- MYSQL_ROOT_PASSWORD= - MYSQL_ROOT_PASSWORD=
- MARIADB_AUTO_UPGRADE=1 - MARIADB_AUTO_UPGRADE=1
@ -22,7 +22,7 @@ services:
image: nextcloud:fpm-alpine image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
environment: environment:
- MYSQL_HOST=db - MYSQL_HOST=db
- REDIS_HOST=redis - REDIS_HOST=redis
@ -38,7 +38,7 @@ services:
ports: ports:
- 127.0.0.1:8080:80 - 127.0.0.1:8080:80
volumes: volumes:
- nextcloud:/var/www/html:ro - nextcloud:/var/www/html:z,ro
depends_on: depends_on:
- app - app
@ -46,7 +46,7 @@ services:
image: nextcloud:fpm-alpine image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
entrypoint: /cron.sh entrypoint: /cron.sh
depends_on: depends_on:
- db - db

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

@ -5,7 +5,7 @@ services:
image: postgres:alpine image: postgres:alpine
restart: always restart: always
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data:Z
env_file: env_file:
- db.env - db.env
@ -19,7 +19,7 @@ services:
ports: ports:
- 127.0.0.1:8080:80 - 127.0.0.1:8080:80
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
environment: environment:
- POSTGRES_HOST=db - POSTGRES_HOST=db
- REDIS_HOST=redis - REDIS_HOST=redis
@ -33,7 +33,7 @@ services:
image: nextcloud:apache image: nextcloud:apache
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
entrypoint: /cron.sh entrypoint: /cron.sh
depends_on: depends_on:
- db - db

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

@ -5,7 +5,7 @@ services:
image: postgres:alpine image: postgres:alpine
restart: always restart: always
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data:z
env_file: env_file:
- db.env - db.env
@ -17,7 +17,7 @@ services:
image: nextcloud:fpm-alpine image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
environment: environment:
- POSTGRES_HOST=db - POSTGRES_HOST=db
- REDIS_HOST=redis - REDIS_HOST=redis
@ -33,7 +33,7 @@ services:
ports: ports:
- 127.0.0.1:8080:80 - 127.0.0.1:8080:80
volumes: volumes:
- nextcloud:/var/www/html:ro - nextcloud:/var/www/html:z,ro
depends_on: depends_on:
- app - app
@ -41,7 +41,7 @@ services:
image: nextcloud:fpm-alpine image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
entrypoint: /cron.sh entrypoint: /cron.sh
depends_on: depends_on:
- db - db

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

@ -6,7 +6,7 @@ services:
command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
restart: always restart: always
volumes: volumes:
- db:/var/lib/mysql - db:/var/lib/mysql:Z
environment: environment:
- MYSQL_ROOT_PASSWORD= - MYSQL_ROOT_PASSWORD=
- MARIADB_AUTO_UPGRADE=1 - MARIADB_AUTO_UPGRADE=1
@ -22,7 +22,7 @@ services:
image: nextcloud:apache image: nextcloud:apache
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
environment: environment:
- VIRTUAL_HOST= - VIRTUAL_HOST=
- LETSENCRYPT_HOST= - LETSENCRYPT_HOST=
@ -42,7 +42,7 @@ services:
image: nextcloud:apache image: nextcloud:apache
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
entrypoint: /cron.sh entrypoint: /cron.sh
depends_on: depends_on:
- db - db
@ -57,10 +57,10 @@ services:
labels: labels:
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true" com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
volumes: volumes:
- certs:/etc/nginx/certs:ro - certs:/etc/nginx/certs:z,ro
- vhost.d:/etc/nginx/vhost.d - vhost.d:/etc/nginx/vhost.d:z
- html:/usr/share/nginx/html - html:/usr/share/nginx/html:z
- /var/run/docker.sock:/tmp/docker.sock:ro - /var/run/docker.sock:/tmp/docker.sock:z,ro
networks: networks:
- proxy-tier - proxy-tier
@ -68,11 +68,11 @@ services:
image: nginxproxy/acme-companion image: nginxproxy/acme-companion
restart: always restart: always
volumes: volumes:
- certs:/etc/nginx/certs - certs:/etc/nginx/certs:z
- acme:/etc/acme.sh - acme:/etc/acme.sh:z
- vhost.d:/etc/nginx/vhost.d - vhost.d:/etc/nginx/vhost.d:z
- html:/usr/share/nginx/html - html:/usr/share/nginx/html:z
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:z,ro
networks: networks:
- proxy-tier - proxy-tier
depends_on: depends_on:

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

@ -6,7 +6,7 @@ services:
command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
restart: always restart: always
volumes: volumes:
- db:/var/lib/mysql - db:/var/lib/mysql:Z
environment: environment:
- MYSQL_ROOT_PASSWORD= - MYSQL_ROOT_PASSWORD=
- MARIADB_AUTO_UPGRADE=1 - MARIADB_AUTO_UPGRADE=1
@ -22,7 +22,7 @@ services:
image: nextcloud:fpm-alpine image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
environment: environment:
- MYSQL_HOST=db - MYSQL_HOST=db
- REDIS_HOST=redis - REDIS_HOST=redis
@ -36,7 +36,7 @@ services:
build: ./web build: ./web
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html:ro - nextcloud:/var/www/html:z,ro
environment: environment:
- VIRTUAL_HOST= - VIRTUAL_HOST=
- LETSENCRYPT_HOST= - LETSENCRYPT_HOST=
@ -51,7 +51,7 @@ services:
image: nextcloud:fpm-alpine image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
entrypoint: /cron.sh entrypoint: /cron.sh
depends_on: depends_on:
- db - db
@ -66,10 +66,10 @@ services:
labels: labels:
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true" com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
volumes: volumes:
- certs:/etc/nginx/certs:ro - certs:/etc/nginx/certs:z,ro
- vhost.d:/etc/nginx/vhost.d - vhost.d:/etc/nginx/vhost.d:z
- html:/usr/share/nginx/html - html:/usr/share/nginx/html:z
- /var/run/docker.sock:/tmp/docker.sock:ro - /var/run/docker.sock:/tmp/docker.sock:z,ro
networks: networks:
- proxy-tier - proxy-tier
@ -77,11 +77,11 @@ services:
image: nginxproxy/acme-companion image: nginxproxy/acme-companion
restart: always restart: always
volumes: volumes:
- certs:/etc/nginx/certs - certs:/etc/nginx/certs:z
- acme:/etc/acme.sh - acme:/etc/acme.sh:z
- vhost.d:/etc/nginx/vhost.d - vhost.d:/etc/nginx/vhost.d:z
- html:/usr/share/nginx/html - html:/usr/share/nginx/html:z
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:z,ro
networks: networks:
- proxy-tier - proxy-tier
depends_on: depends_on:

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

@ -5,7 +5,7 @@ services:
image: postgres:alpine image: postgres:alpine
restart: always restart: always
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data:Z
env_file: env_file:
- db.env - db.env
@ -17,7 +17,7 @@ services:
image: nextcloud:apache image: nextcloud:apache
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
environment: environment:
- VIRTUAL_HOST= - VIRTUAL_HOST=
- LETSENCRYPT_HOST= - LETSENCRYPT_HOST=
@ -37,7 +37,7 @@ services:
image: nextcloud:apache image: nextcloud:apache
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
entrypoint: /cron.sh entrypoint: /cron.sh
depends_on: depends_on:
- db - db
@ -52,10 +52,10 @@ services:
labels: labels:
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true" com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
volumes: volumes:
- certs:/etc/nginx/certs:ro - certs:/etc/nginx/certs:z,ro
- vhost.d:/etc/nginx/vhost.d - vhost.d:/etc/nginx/vhost.d:z
- html:/usr/share/nginx/html - html:/usr/share/nginx/html:z
- /var/run/docker.sock:/tmp/docker.sock:ro - /var/run/docker.sock:/tmp/docker.sock:z,ro
networks: networks:
- proxy-tier - proxy-tier
@ -63,11 +63,11 @@ services:
image: nginxproxy/acme-companion image: nginxproxy/acme-companion
restart: always restart: always
volumes: volumes:
- certs:/etc/nginx/certs - certs:/etc/nginx/certs:z
- acme:/etc/acme.sh - acme:/etc/acme.sh:z
- vhost.d:/etc/nginx/vhost.d - vhost.d:/etc/nginx/vhost.d:z
- html:/usr/share/nginx/html - html:/usr/share/nginx/html:z
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:z,ro
networks: networks:
- proxy-tier - proxy-tier
depends_on: depends_on:

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

@ -5,7 +5,7 @@ services:
image: postgres:alpine image: postgres:alpine
restart: always restart: always
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data:Z
env_file: env_file:
- db.env - db.env
@ -17,7 +17,7 @@ services:
image: nextcloud:fpm-alpine image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
environment: environment:
- POSTGRES_HOST=db - POSTGRES_HOST=db
- REDIS_HOST=redis - REDIS_HOST=redis
@ -31,7 +31,7 @@ services:
build: ./web build: ./web
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html:ro - nextcloud:/var/www/html:z,ro
environment: environment:
- VIRTUAL_HOST= - VIRTUAL_HOST=
- LETSENCRYPT_HOST= - LETSENCRYPT_HOST=
@ -46,7 +46,7 @@ services:
image: nextcloud:fpm-alpine image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html:z
entrypoint: /cron.sh entrypoint: /cron.sh
depends_on: depends_on:
- db - db
@ -61,10 +61,10 @@ services:
labels: labels:
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true" com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
volumes: volumes:
- certs:/etc/nginx/certs:ro - certs:/etc/nginx/certs:z,ro
- vhost.d:/etc/nginx/vhost.d - vhost.d:/etc/nginx/vhost.d:z
- html:/usr/share/nginx/html - html:/usr/share/nginx/html:z
- /var/run/docker.sock:/tmp/docker.sock:ro - /var/run/docker.sock:/tmp/docker.sock:z,ro
networks: networks:
- proxy-tier - proxy-tier
@ -72,11 +72,11 @@ services:
image: nginxproxy/acme-companion image: nginxproxy/acme-companion
restart: always restart: always
volumes: volumes:
- certs:/etc/nginx/certs - certs:/etc/nginx/certs:z
- acme:/etc/acme.sh - acme:/etc/acme.sh:z
- vhost.d:/etc/nginx/vhost.d - vhost.d:/etc/nginx/vhost.d:z
- html:/usr/share/nginx/html - html:/usr/share/nginx/html:z
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:z,ro
networks: networks:
- proxy-tier - proxy-tier
depends_on: depends_on: