From 0ffdc9c457508df42cdde0d6bc64ec22c3be843e Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Thu, 14 Jan 2021 19:17:08 +0100 Subject: [PATCH] Config: Update docker-compose.yml examples --- docker-compose.drone.yml | 9 +++++---- docker-compose.postgres.yml | 9 +++++---- docker-compose.yml | 11 ++++++----- docker/examples/arm64/docker-compose.yml | 9 +++++---- docker/examples/docker-compose.yml | 9 +++++---- docker/examples/macos/docker-compose.yml | 9 +++++---- docker/examples/sqlite/docker-compose.yml | 9 +++++---- docker/examples/windows/docker-compose.yml | 9 +++++---- internal/config/flags.go | 2 +- 9 files changed, 42 insertions(+), 34 deletions(-) diff --git a/docker-compose.drone.yml b/docker-compose.drone.yml index 18fb98af9..dbbd45772 100644 --- a/docker-compose.drone.yml +++ b/docker-compose.drone.yml @@ -26,6 +26,7 @@ services: PHOTOPRISM_DETACH_SERVER: "true" PHOTOPRISM_HTTP_HOST: "0.0.0.0" PHOTOPRISM_HTTP_PORT: 2342 + PHOTOPRISM_HTTP_COMPRESSION: "gzip" # Improves transfer speed and bandwidth utilization (none or gzip) PHOTOPRISM_DATABASE_DRIVER: "mysql" PHOTOPRISM_DATABASE_SERVER: "photoprism-db:4001" PHOTOPRISM_DATABASE_NAME: "photoprism" @@ -39,16 +40,16 @@ services: PHOTOPRISM_ORIGINALS_PATH: "/go/src/github.com/photoprism/photoprism/storage/originals" PHOTOPRISM_IMPORT_PATH: "/go/src/github.com/photoprism/photoprism/storage/import" PHOTOPRISM_DISABLE_BACKUPS: "false" # Don't backup photo and album metadata to YAML files - PHOTOPRISM_DISABLE_WEBDAV: "false" # Disable built-in WebDAV server - PHOTOPRISM_DISABLE_SETTINGS: "false" # Users can not view or change settings + PHOTOPRISM_DISABLE_WEBDAV: "false" # Disables built-in WebDAV server + PHOTOPRISM_DISABLE_SETTINGS: "false" # Disables Settings in Web UI PHOTOPRISM_DISABLE_PLACES: "false" # Disables reverse geocoding and maps PHOTOPRISM_DISABLE_EXIFTOOL: "false" # Don't create ExifTool JSON files for improved metadata extraction PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Don't use TensorFlow for image classification PHOTOPRISM_DETECT_NSFW: "false" # Flag photos as private that MAY be offensive (requires TensorFlow) PHOTOPRISM_UPLOAD_NSFW: "false" # Allow uploads that may be offensive - PHOTOPRISM_DARKTABLE_PRESETS: "false" # Use Darktable presets (disables concurrent raw image conversion) + PHOTOPRISM_DARKTABLE_PRESETS: "false" # Enables Darktable presets and disables concurrent RAW conversion PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear - PHOTOPRISM_THUMB_UNCACHED: "true" # Enable on-demand thumbnail rendering (high memory and cpu usage) + PHOTOPRISM_THUMB_UNCACHED: "true" # Enables on-demand thumbnail rendering (high memory and cpu usage) PHOTOPRISM_THUMB_SIZE: 2048 # Pre-rendered thumbnail size limit (default 2048, min 720, max 7680) # PHOTOPRISM_THUMB_SIZE: 4096 # Retina 4K, DCI 4K (requires more storage); 7680 for 8K Ultra HD PHOTOPRISM_THUMB_SIZE_UNCACHED: 7680 # On-demand rendering size limit (default 7680, min 720, max 7680) diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml index 820f58155..bd60f1bc2 100644 --- a/docker-compose.postgres.yml +++ b/docker-compose.postgres.yml @@ -30,6 +30,7 @@ services: PHOTOPRISM_SERVER_MODE: "debug" PHOTOPRISM_HTTP_HOST: "0.0.0.0" PHOTOPRISM_HTTP_PORT: 2342 + PHOTOPRISM_HTTP_COMPRESSION: "gzip" # Improves transfer speed and bandwidth utilization (none or gzip) PHOTOPRISM_DATABASE_DRIVER: "postgres" PHOTOPRISM_DATABASE_SERVER: "postgres:5432" PHOTOPRISM_DATABASE_NAME: "photoprism" @@ -43,16 +44,16 @@ services: PHOTOPRISM_ORIGINALS_PATH: "/go/src/github.com/photoprism/photoprism/storage/originals" PHOTOPRISM_IMPORT_PATH: "/go/src/github.com/photoprism/photoprism/storage/import" PHOTOPRISM_DISABLE_BACKUPS: "false" # Don't backup photo and album metadata to YAML files - PHOTOPRISM_DISABLE_WEBDAV: "false" # Disable built-in WebDAV server - PHOTOPRISM_DISABLE_SETTINGS: "false" # Users can not view or change settings + PHOTOPRISM_DISABLE_WEBDAV: "false" # Disables built-in WebDAV server + PHOTOPRISM_DISABLE_SETTINGS: "false" # Disables Settings in Web UI PHOTOPRISM_DISABLE_PLACES: "false" # Disables reverse geocoding and maps PHOTOPRISM_DISABLE_EXIFTOOL: "false" # Don't create ExifTool JSON files for improved metadata extraction PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Don't use TensorFlow for image classification PHOTOPRISM_DETECT_NSFW: "false" # Flag photos as private that MAY be offensive (requires TensorFlow) PHOTOPRISM_UPLOAD_NSFW: "false" # Allow uploads that may be offensive - PHOTOPRISM_DARKTABLE_PRESETS: "false" # Use Darktable presets (disables concurrent raw image conversion) + PHOTOPRISM_DARKTABLE_PRESETS: "false" # Enables Darktable presets and disables concurrent RAW conversion PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear - PHOTOPRISM_THUMB_UNCACHED: "true" # Enable on-demand thumbnail rendering (high memory and cpu usage) + PHOTOPRISM_THUMB_UNCACHED: "true" # Enables on-demand thumbnail rendering (high memory and cpu usage) PHOTOPRISM_THUMB_SIZE: 2048 # Pre-rendered thumbnail size limit (default 2048, min 720, max 7680) # PHOTOPRISM_THUMB_SIZE: 4096 # Retina 4K, DCI 4K (requires more storage); 7680 for 8K Ultra HD PHOTOPRISM_THUMB_SIZE_UNCACHED: 7680 # On-demand rendering size limit (default 7680, min 720, max 7680) diff --git a/docker-compose.yml b/docker-compose.yml index d219b6968..bab183828 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,6 +45,7 @@ services: PHOTOPRISM_SERVER_MODE: "debug" PHOTOPRISM_HTTP_HOST: "0.0.0.0" PHOTOPRISM_HTTP_PORT: 2342 + PHOTOPRISM_HTTP_COMPRESSION: "gzip" # Improves transfer speed and bandwidth utilization (none or gzip) PHOTOPRISM_DATABASE_DRIVER: "mysql" PHOTOPRISM_DATABASE_SERVER: "photoprism-db:4001" PHOTOPRISM_DATABASE_NAME: "photoprism" @@ -58,16 +59,16 @@ services: PHOTOPRISM_ORIGINALS_PATH: "/go/src/github.com/photoprism/photoprism/storage/originals" PHOTOPRISM_IMPORT_PATH: "/go/src/github.com/photoprism/photoprism/storage/import" PHOTOPRISM_DISABLE_BACKUPS: "false" # Don't backup photo and album metadata to YAML files - PHOTOPRISM_DISABLE_WEBDAV: "false" # Disable built-in WebDAV server - PHOTOPRISM_DISABLE_SETTINGS: "false" # Users can not view or change settings + PHOTOPRISM_DISABLE_WEBDAV: "false" # Disables built-in WebDAV server + PHOTOPRISM_DISABLE_SETTINGS: "false" # Disables Settings in Web UI PHOTOPRISM_DISABLE_PLACES: "false" # Disables reverse geocoding and maps PHOTOPRISM_DISABLE_EXIFTOOL: "false" # Don't create ExifTool JSON files for improved metadata extraction PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Don't use TensorFlow for image classification PHOTOPRISM_DETECT_NSFW: "false" # Flag photos as private that MAY be offensive (requires TensorFlow) - PHOTOPRISM_UPLOAD_NSFW: "false" # Allow uploads that may be offensive - PHOTOPRISM_DARKTABLE_PRESETS: "false" # Use Darktable presets (disables concurrent raw image conversion) + PHOTOPRISM_UPLOAD_NSFW: "false" # Allows uploads that may be offensive + PHOTOPRISM_DARKTABLE_PRESETS: "false" # Enables Darktable presets and disables concurrent RAW conversion PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear - PHOTOPRISM_THUMB_UNCACHED: "true" # Enable on-demand thumbnail rendering (high memory and cpu usage) + PHOTOPRISM_THUMB_UNCACHED: "true" # Enables on-demand thumbnail rendering (high memory and cpu usage) PHOTOPRISM_THUMB_SIZE: 2048 # Pre-rendered thumbnail size limit (default 2048, min 720, max 7680) # PHOTOPRISM_THUMB_SIZE: 4096 # Retina 4K, DCI 4K (requires more storage); 7680 for 8K Ultra HD PHOTOPRISM_THUMB_SIZE_UNCACHED: 7680 # On-demand rendering size limit (default 7680, min 720, max 7680) diff --git a/docker/examples/arm64/docker-compose.yml b/docker/examples/arm64/docker-compose.yml index b962d3c28..439544aa6 100644 --- a/docker/examples/arm64/docker-compose.yml +++ b/docker/examples/arm64/docker-compose.yml @@ -49,10 +49,11 @@ services: PHOTOPRISM_DEBUG: "false" # Run in debug mode (shows additional log messages) PHOTOPRISM_PUBLIC: "false" # No authentication required (disables password protection) PHOTOPRISM_READONLY: "false" # Don't modify originals directory (reduced functionality) - PHOTOPRISM_EXPERIMENTAL: "false" # Enable experimental features - PHOTOPRISM_DISABLE_WEBDAV: "false" # Disable built-in WebDAV server - PHOTOPRISM_DISABLE_SETTINGS: "false" # Users can not view or change settings - PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Don't use TensorFlow for image classification + PHOTOPRISM_EXPERIMENTAL: "false" # Enables experimental features + PHOTOPRISM_DISABLE_WEBDAV: "false" # Disables built-in WebDAV server + PHOTOPRISM_DISABLE_SETTINGS: "false" # Disables Settings in Web UI + PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Disables using TensorFlow for image classification + PHOTOPRISM_DARKTABLE_PRESETS: "true" # Enables Darktable presets and disables concurrent RAW conversion PHOTOPRISM_DETECT_NSFW: "false" # Flag photos as private that MAY be offensive PHOTOPRISM_UPLOAD_NSFW: "true" # Allow uploads that MAY be offensive # PHOTOPRISM_DATABASE_DRIVER: "sqlite" # SQLite is an embedded database that doesn't require a server diff --git a/docker/examples/docker-compose.yml b/docker/examples/docker-compose.yml index 80864999f..4eb90a572 100644 --- a/docker/examples/docker-compose.yml +++ b/docker/examples/docker-compose.yml @@ -48,10 +48,11 @@ services: PHOTOPRISM_DEBUG: "false" # Run in debug mode (shows additional log messages) PHOTOPRISM_PUBLIC: "false" # No authentication required (disables password protection) PHOTOPRISM_READONLY: "false" # Don't modify originals directory (reduced functionality) - PHOTOPRISM_EXPERIMENTAL: "false" # Enable experimental features - PHOTOPRISM_DISABLE_WEBDAV: "false" # Disable built-in WebDAV server - PHOTOPRISM_DISABLE_SETTINGS: "false" # Users can not view or change settings - PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Don't use TensorFlow for image classification + PHOTOPRISM_EXPERIMENTAL: "false" # Enables experimental features + PHOTOPRISM_DISABLE_WEBDAV: "false" # Disables built-in WebDAV server + PHOTOPRISM_DISABLE_SETTINGS: "false" # Disables Settings in Web UI + PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Disables using TensorFlow for image classification + PHOTOPRISM_DARKTABLE_PRESETS: "false" # Enables Darktable presets and disables concurrent RAW conversion PHOTOPRISM_DETECT_NSFW: "false" # Flag photos as private that MAY be offensive (requires TensorFlow) PHOTOPRISM_UPLOAD_NSFW: "true" # Allow uploads that MAY be offensive # PHOTOPRISM_DATABASE_DRIVER: "sqlite" # SQLite is an embedded database that doesn't require a server diff --git a/docker/examples/macos/docker-compose.yml b/docker/examples/macos/docker-compose.yml index 788a73647..81dc127bb 100644 --- a/docker/examples/macos/docker-compose.yml +++ b/docker/examples/macos/docker-compose.yml @@ -47,10 +47,11 @@ services: PHOTOPRISM_DEBUG: "false" # Run in debug mode (shows additional log messages) PHOTOPRISM_PUBLIC: "false" # No authentication required (disables password protection) PHOTOPRISM_READONLY: "false" # Don't modify originals directory (reduced functionality) - PHOTOPRISM_EXPERIMENTAL: "false" # Enable experimental features - PHOTOPRISM_DISABLE_WEBDAV: "false" # Disable built-in WebDAV server - PHOTOPRISM_DISABLE_SETTINGS: "false" # Users can not view or change settings - PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Don't use TensorFlow for image classification + PHOTOPRISM_EXPERIMENTAL: "false" # Enables experimental features + PHOTOPRISM_DISABLE_WEBDAV: "false" # Disables built-in WebDAV server + PHOTOPRISM_DISABLE_SETTINGS: "false" # Disables Settings in Web UI + PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Disables using TensorFlow for image classification + PHOTOPRISM_DARKTABLE_PRESETS: "false" # Enables Darktable presets and disables concurrent RAW conversion PHOTOPRISM_DETECT_NSFW: "false" # Flag photos as private that MAY be offensive (requires TensorFlow) PHOTOPRISM_UPLOAD_NSFW: "true" # Allow uploads that MAY be offensive PHOTOPRISM_DATABASE_DRIVER: "mysql" # Use MariaDB (or MySQL) instead of SQLite for improved performance diff --git a/docker/examples/sqlite/docker-compose.yml b/docker/examples/sqlite/docker-compose.yml index 764a2f7aa..0fd750dd0 100644 --- a/docker/examples/sqlite/docker-compose.yml +++ b/docker/examples/sqlite/docker-compose.yml @@ -48,10 +48,11 @@ services: PHOTOPRISM_DEBUG: "false" # Run in debug mode (shows additional log messages) PHOTOPRISM_PUBLIC: "false" # No authentication required (disables password protection) PHOTOPRISM_READONLY: "false" # Don't modify originals directory (reduced functionality) - PHOTOPRISM_EXPERIMENTAL: "false" # Enable experimental features - PHOTOPRISM_DISABLE_WEBDAV: "false" # Disable built-in WebDAV server - PHOTOPRISM_DISABLE_SETTINGS: "false" # Users can not view or change settings - PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Don't use TensorFlow for image classification + PHOTOPRISM_EXPERIMENTAL: "false" # Enables experimental features + PHOTOPRISM_DISABLE_WEBDAV: "false" # Disables built-in WebDAV server + PHOTOPRISM_DISABLE_SETTINGS: "false" # Disables Settings in Web UI + PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Disables using TensorFlow for image classification + PHOTOPRISM_DARKTABLE_PRESETS: "true" # Enables Darktable presets and disables concurrent RAW conversion PHOTOPRISM_DETECT_NSFW: "false" # Flag photos as private that MAY be offensive (requires TensorFlow) PHOTOPRISM_UPLOAD_NSFW: "true" # Allow uploads that MAY be offensive PHOTOPRISM_DATABASE_DRIVER: "sqlite" # SQLite is an embedded database that doesn't require a server diff --git a/docker/examples/windows/docker-compose.yml b/docker/examples/windows/docker-compose.yml index 9c9a5b06f..6e0987229 100644 --- a/docker/examples/windows/docker-compose.yml +++ b/docker/examples/windows/docker-compose.yml @@ -49,10 +49,11 @@ services: PHOTOPRISM_DEBUG: "false" # Run in debug mode, shows additional log messages PHOTOPRISM_PUBLIC: "false" # No authentication required, disables password protection PHOTOPRISM_READONLY: "false" # Don't modify originals folder; disables import, upload, and delete - PHOTOPRISM_EXPERIMENTAL: "false" # Enable experimental features - PHOTOPRISM_DISABLE_WEBDAV: "false" # Disable built-in WebDAV server - PHOTOPRISM_DISABLE_SETTINGS: "false" # Users can not view or change settings - PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Don't use TensorFlow for image classification + PHOTOPRISM_EXPERIMENTAL: "false" # Enables experimental features + PHOTOPRISM_DISABLE_WEBDAV: "false" # Disables built-in WebDAV server + PHOTOPRISM_DISABLE_SETTINGS: "false" # Disables Settings in Web UI + PHOTOPRISM_DISABLE_TENSORFLOW: "false" # Disables using TensorFlow for image classification + PHOTOPRISM_DARKTABLE_PRESETS: "false" # Enables Darktable presets and disables concurrent RAW conversion PHOTOPRISM_DETECT_NSFW: "false" # Flag photos as private that MAY be offensive (requires TensorFlow) PHOTOPRISM_UPLOAD_NSFW: "true" # Allow uploads that MAY be offensive PHOTOPRISM_DATABASE_DRIVER: "mysql" # Use MariaDB (or MySQL) instead of SQLite for improved performance diff --git a/internal/config/flags.go b/internal/config/flags.go index f689814e5..c7230e96f 100644 --- a/internal/config/flags.go +++ b/internal/config/flags.go @@ -283,7 +283,7 @@ var GlobalFlags = []cli.Flag{ }, cli.BoolFlag{ Name: "darktable-presets", - Usage: "disables simultaneous conversion of raw files to apply Darktable presets", + Usage: "enables Darktable presets and disables concurrent RAW conversion", EnvVar: "PHOTOPRISM_DARKTABLE_PRESETS", }, cli.StringFlag{