Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c11f3f494e |
@@ -2,7 +2,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
image: "docker.elastic.co/elasticsearch/elasticsearch:8.17.2"
|
image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.6"
|
||||||
environment:
|
environment:
|
||||||
- cluster.name=docker-cluster
|
- cluster.name=docker-cluster
|
||||||
- bootstrap.memory_lock=true
|
- bootstrap.memory_lock=true
|
||||||
@@ -29,7 +29,7 @@ services:
|
|||||||
mode: 0600
|
mode: 0600
|
||||||
|
|
||||||
searchindexer:
|
searchindexer:
|
||||||
image: nextcloud:31.0.6-fpm
|
image: nextcloud:32.0.1-fpm
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ services:
|
|||||||
- whiteboard_jwt
|
- whiteboard_jwt
|
||||||
|
|
||||||
whiteboard:
|
whiteboard:
|
||||||
image: ghcr.io/nextcloud-releases/whiteboard:v1.1.2
|
image: ghcr.io/nextcloud-releases/whiteboard:v1.4.1
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
|
|||||||
+18
-10
@@ -1,7 +1,7 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: nginx:1.29.0
|
image: nginx:1.29.3
|
||||||
depends_on:
|
depends_on:
|
||||||
- app
|
- app
|
||||||
configs:
|
configs:
|
||||||
@@ -17,7 +17,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
- nextdata:/var/www/html/data:cached
|
- /mnt/data-3t/nextdata:/var/www/html/data:cached
|
||||||
- nextconfig:/var/www/html/config:cached
|
- nextconfig:/var/www/html/config:cached
|
||||||
- ${EXTRA_VOLUME}
|
- ${EXTRA_VOLUME}
|
||||||
networks:
|
networks:
|
||||||
@@ -30,13 +30,22 @@ services:
|
|||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.docker.network=proxy"
|
- "traefik.docker.network=proxy"
|
||||||
|
# shared service & middleware
|
||||||
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
|
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
|
||||||
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https"
|
||||||
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true"
|
||||||
|
# public domain (lets-encrypt cert)
|
||||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https"
|
# local domain (self-signed cert)
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true"
|
- "traefik.http.routers.${STACK_NAME}-local.rule=Host(`${LOCAL_DOMAIN}`)"
|
||||||
|
- "traefik.http.routers.${STACK_NAME}-local.tls=true"
|
||||||
|
- "traefik.http.routers.${STACK_NAME}-local.entrypoints=web-secure"
|
||||||
|
- "traefik.http.routers.${STACK_NAME}-local.middlewares=${STACK_NAME}-redirect"
|
||||||
|
- "traefik.http.routers.${STACK_NAME}-local.service=${STACK_NAME}"
|
||||||
|
|
||||||
- "caddy=${DOMAIN}"
|
- "caddy=${DOMAIN}"
|
||||||
- "caddy.reverse_proxy={{upstreams 80}}"
|
- "caddy.reverse_proxy={{upstreams 80}}"
|
||||||
- "caddy.tls.on_demand="
|
- "caddy.tls.on_demand="
|
||||||
@@ -48,7 +57,7 @@ services:
|
|||||||
start_period: 5m
|
start_period: 5m
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: nextcloud:31.0.6-fpm
|
image: nextcloud:32.0.1-fpm
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
configs:
|
configs:
|
||||||
@@ -85,7 +94,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
- nextdata:/var/www/html/data:cached
|
- /mnt/data-3t/nextdata:/var/www/html/data:cached
|
||||||
- nextconfig:/var/www/html/config:cached
|
- nextconfig:/var/www/html/config:cached
|
||||||
- ${EXTRA_VOLUME}
|
- ${EXTRA_VOLUME}
|
||||||
networks:
|
networks:
|
||||||
@@ -109,11 +118,11 @@ services:
|
|||||||
start_period: 15m
|
start_period: 15m
|
||||||
|
|
||||||
cron:
|
cron:
|
||||||
image: nextcloud:31.0.6-fpm
|
image: nextcloud:32.0.1-fpm
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
- nextdata:/var/www/html/data:cached
|
- /mnt/data-3t/nextdata:/var/www/html/data:cached
|
||||||
- nextconfig:/var/www/html/config:cached
|
- nextconfig:/var/www/html/config:cached
|
||||||
- ${EXTRA_VOLUME}
|
- ${EXTRA_VOLUME}
|
||||||
networks:
|
networks:
|
||||||
@@ -125,7 +134,7 @@ services:
|
|||||||
|
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
image: redis:8.0.2-alpine
|
image: redis:8.2.3-alpine
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
volumes:
|
volumes:
|
||||||
@@ -147,7 +156,6 @@ secrets:
|
|||||||
volumes:
|
volumes:
|
||||||
nextcloud:
|
nextcloud:
|
||||||
nextapps:
|
nextapps:
|
||||||
nextdata:
|
|
||||||
nextconfig:
|
nextconfig:
|
||||||
redis:
|
redis:
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user