From 0d225450dab3c91abfe77d8ed4f01c2385f18be2 Mon Sep 17 00:00:00 2001 From: Daniel Schulz Date: Tue, 27 Jun 2023 00:33:29 +0200 Subject: [PATCH] add note to docker-compose files and update postgres tag --- docs/install/docker/ipv6_plain/docker-compose.yml | 4 +++- docs/install/docker/nginx-proxy/docker-compose.yml | 4 +++- docs/install/docker/plain/docker-compose.yml | 4 +++- docs/install/docker/traefik-nginx/docker-compose.yml | 4 +++- docs/install/swag.md | 2 +- docs/install/truenas_portainer.md | 6 ++++-- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/docs/install/docker/ipv6_plain/docker-compose.yml b/docs/install/docker/ipv6_plain/docker-compose.yml index c56a8425..312b1400 100644 --- a/docs/install/docker/ipv6_plain/docker-compose.yml +++ b/docs/install/docker/ipv6_plain/docker-compose.yml @@ -2,7 +2,7 @@ version: "2.4" services: db_recipes: restart: always - image: postgres:11-alpine + image: postgres:15-alpine volumes: - ${POSTGRES_DATA_DIR:-./postgresql}:/var/lib/postgresql/data env_file: @@ -22,6 +22,7 @@ services: - ./.env volumes: - staticfiles:/opt/recipes/staticfiles + # Do not make this a bind mount, see https://docs.tandoor.dev/install/docker/#volumes-vs-bind-mounts - nginx_config:/opt/recipes/nginx/conf.d - ${MEDIA_FILES_DIR:-./mediafiles}:/opt/recipes/mediafiles depends_on: @@ -41,6 +42,7 @@ services: depends_on: - web_recipes volumes: + # Do not make this a bind mount, see https://docs.tandoor.dev/install/docker/#volumes-vs-bind-mounts - nginx_config:/etc/nginx/conf.d:ro - staticfiles:/static:ro - ${MEDIA_FILES_DIR:-./mediafiles}:/media:ro diff --git a/docs/install/docker/nginx-proxy/docker-compose.yml b/docs/install/docker/nginx-proxy/docker-compose.yml index 51abb797..7040c566 100644 --- a/docs/install/docker/nginx-proxy/docker-compose.yml +++ b/docs/install/docker/nginx-proxy/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: db_recipes: restart: always - image: postgres:11-alpine + image: postgres:15-alpine volumes: - ./postgresql:/var/lib/postgresql/data env_file: @@ -17,6 +17,7 @@ services: - ./.env volumes: - staticfiles:/opt/recipes/staticfiles + # Do not make this a bind mount, see https://docs.tandoor.dev/install/docker/#volumes-vs-bind-mounts - nginx_config:/opt/recipes/nginx/conf.d - ./mediafiles:/opt/recipes/mediafiles depends_on: @@ -32,6 +33,7 @@ services: depends_on: - web_recipes volumes: + # Do not make this a bind mount, see https://docs.tandoor.dev/install/docker/#volumes-vs-bind-mounts - nginx_config:/etc/nginx/conf.d:ro - staticfiles:/static:ro - ./mediafiles:/media:ro diff --git a/docs/install/docker/plain/docker-compose.yml b/docs/install/docker/plain/docker-compose.yml index 2a3b7c3f..203217e4 100644 --- a/docs/install/docker/plain/docker-compose.yml +++ b/docs/install/docker/plain/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: db_recipes: restart: always - image: postgres:11-alpine + image: postgres:15-alpine volumes: - ./postgresql:/var/lib/postgresql/data env_file: @@ -15,6 +15,7 @@ services: - ./.env volumes: - staticfiles:/opt/recipes/staticfiles + # Do not make this a bind mount, see https://docs.tandoor.dev/install/docker/#volumes-vs-bind-mounts - nginx_config:/opt/recipes/nginx/conf.d - ./mediafiles:/opt/recipes/mediafiles depends_on: @@ -30,6 +31,7 @@ services: depends_on: - web_recipes volumes: + # Do not make this a bind mount, see https://docs.tandoor.dev/install/docker/#volumes-vs-bind-mounts - nginx_config:/etc/nginx/conf.d:ro - staticfiles:/static:ro - ./mediafiles:/media:ro diff --git a/docs/install/docker/traefik-nginx/docker-compose.yml b/docs/install/docker/traefik-nginx/docker-compose.yml index da4817d0..9947c3a8 100644 --- a/docs/install/docker/traefik-nginx/docker-compose.yml +++ b/docs/install/docker/traefik-nginx/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: db_recipes: restart: always - image: postgres:11-alpine + image: postgres:15-alpine volumes: - ./postgresql:/var/lib/postgresql/data env_file: @@ -17,6 +17,7 @@ services: - ./.env volumes: - staticfiles:/opt/recipes/staticfiles + # Do not make this a bind mount, see https://docs.tandoor.dev/install/docker/#volumes-vs-bind-mounts - nginx_config:/opt/recipes/nginx/conf.d - ./mediafiles:/opt/recipes/mediafiles depends_on: @@ -30,6 +31,7 @@ services: env_file: - ./.env volumes: + # Do not make this a bind mount, see https://docs.tandoor.dev/install/docker/#volumes-vs-bind-mounts - nginx_config:/etc/nginx/conf.d:ro - staticfiles:/static:ro - ./mediafiles:/media:ro diff --git a/docs/install/swag.md b/docs/install/swag.md index 3beeb112..3f1eda6a 100644 --- a/docs/install/swag.md +++ b/docs/install/swag.md @@ -69,7 +69,7 @@ services: db_recipes: restart: always container_name: db_recipes - image: postgres:11-alpine + image: postgres:15-alpine volumes: - ./recipes/db:/var/lib/postgresql/data env_file: diff --git a/docs/install/truenas_portainer.md b/docs/install/truenas_portainer.md index 3bb3f9fd..03b288fd 100644 --- a/docs/install/truenas_portainer.md +++ b/docs/install/truenas_portainer.md @@ -80,7 +80,7 @@ Basic guide to setup Docker and Portainer TrueNAS Core. services: db_recipes: restart: always - image: postgres:11-alpine + image: postgres:15-alpine volumes: - ./postgresql:/var/lib/postgresql/data env_file: @@ -93,7 +93,8 @@ services: - stack.env volumes: - staticfiles:/opt/recipes/staticfiles - - nginx_config:/opt/recipes/nginx/conf.d + # Do not make this a bind mount, see https://docs.tandoor.dev/install/docker/#volumes-vs-bind-mounts + - nginx_config:/opt/recipes/nginx/conf.d - ./mediafiles:/opt/recipes/mediafiles depends_on: - db_recipes @@ -108,6 +109,7 @@ services: depends_on: - web_recipes volumes: + # Do not make this a bind mount, see https://docs.tandoor.dev/install/docker/#volumes-vs-bind-mounts - nginx_config:/etc/nginx/conf.d:ro - staticfiles:/static - ./mediafiles:/media