From 63cebc74099f7b0a52994395fead68cd27be35b6 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Wed, 19 Jul 2023 00:12:23 +0200 Subject: [PATCH] Video: Update docker-compose.yml config examples #3466 #3498 #3549 Signed-off-by: Michael Mayer --- docker-compose.yml | 11 +++++------ setup/docker/arm64/docker-compose.yml | 8 ++++---- setup/docker/armv7/docker-compose.yml | 4 ++++ setup/docker/cloud/docker-compose.yml | 4 ++++ setup/docker/docker-compose.yml | 8 ++++---- setup/docker/macos/docker-compose.yml | 4 ++++ setup/docker/nvidia/docker-compose.yml | 13 ++++++------- setup/docker/scheduler/docker-compose.yml | 4 ++++ setup/docker/sqlite/docker-compose.yml | 4 ++++ setup/docker/windows/docker-compose.yml | 4 ++++ setup/podman/docker-compose.yml | 8 ++++---- 11 files changed, 47 insertions(+), 25 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fc0d08ea6..8d7030e7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -103,14 +103,13 @@ services: PHOTOPRISM_JPEG_SIZE: 7680 # size limit for converted image files in pixels (720-30000) PHOTOPRISM_JPEG_QUALITY: 85 # a higher value increases the quality and file size of JPEG images and thumbnails (25-100) TF_CPP_MIN_LOG_LEVEL: 0 # show TensorFlow log messages for development + ## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/): + # PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # video bitrate limit in Mbit/s (default: 50) + # LIBVA_DRIVER_NAME: "i965" # For Intel architectures Haswell and older which do not support QSV yet but use VAAPI instead ## Run/install on first startup (options: update https gpu tensorflow davfs clitools clean): PHOTOPRISM_INIT: "https tensorflow" - ## Hardware Video Transcoding (optional): - # PHOTOPRISM_FFMPEG_ENCODER: "nvidia" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "raspberry", "vaapi") Intel: "intel" for Broadwell or later and "vaapi" for Haswell or earlier - # PHOTOPRISM_FFMPEG_ENCODER: "intel" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "raspberry", "vaapi") Intel: "intel" for Broadwell or later and "vaapi" for Haswell or earlier` - # PHOTOPRISM_FFMPEG_SIZE: "1920" # Maximum video size in PIXELS (720-7680) (default: 3840) - # PHOTOPRISM_FFMPEG_BITRATE: "32" # Maximum video BITRATE in Mbit/s (default: 50) - # LIBVA_DRIVER_NAME: "i965" # For Intel architectures Haswell and older which do not support QSV yet but use VAAPI instead ## Share hardware devices with FFmpeg and TensorFlow (optional): # devices: # - "/dev/dri:/dev/dri" # Intel QSV (Broadwell and later) or VAAPI (Haswell and earlier) diff --git a/setup/docker/arm64/docker-compose.yml b/setup/docker/arm64/docker-compose.yml index 9dd8e060b..1acddd049 100644 --- a/setup/docker/arm64/docker-compose.yml +++ b/setup/docker/arm64/docker-compose.yml @@ -84,12 +84,12 @@ services: PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" # meta site description PHOTOPRISM_SITE_AUTHOR: "" # meta site author + ## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/): + # PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # video bitrate limit in Mbit/s (default: 50) ## Run/install on first startup (options: update, gpu, tensorflow, davfs, clean): # PHOTOPRISM_INIT: "update clean" - ## Hardware Video Transcoding: - # PHOTOPRISM_FFMPEG_ENCODER: "raspberry" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "raspberry") - # PHOTOPRISM_FFMPEG_SIZE: "1920" # Maximum video size in PIXELS (720-7680) (default: 3840) - # PHOTOPRISM_FFMPEG_BITRATE: "32" # Maximum video BITRATE in Mbit/s (default: 50) ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200): # PHOTOPRISM_UID: 1000 # PHOTOPRISM_GID: 1000 diff --git a/setup/docker/armv7/docker-compose.yml b/setup/docker/armv7/docker-compose.yml index fcc6dfe0e..70930f636 100644 --- a/setup/docker/armv7/docker-compose.yml +++ b/setup/docker/armv7/docker-compose.yml @@ -78,6 +78,10 @@ services: PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" # meta site description PHOTOPRISM_SITE_AUTHOR: "" # meta site author + ## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/): + # PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # video bitrate limit in Mbit/s (default: 50) ## Run/install on first startup (options: update, gpu, tensorflow, davfs, clean): # PHOTOPRISM_INIT: "update clean" ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200): diff --git a/setup/docker/cloud/docker-compose.yml b/setup/docker/cloud/docker-compose.yml index 904f4285a..97008b9a6 100644 --- a/setup/docker/cloud/docker-compose.yml +++ b/setup/docker/cloud/docker-compose.yml @@ -161,6 +161,10 @@ services: PHOTOPRISM_DATABASE_NAME: "photoprism" # MariaDB or MySQL database schema name PHOTOPRISM_DATABASE_USER: "photoprism" # MariaDB or MySQL database user name PHOTOPRISM_DATABASE_PASSWORD: "_admin_password_" # MariaDB or MySQL database user password + ## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/): + # PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # video bitrate limit in Mbit/s (default: 50) ## Run/install on first startup (options: update, gpu, tensorflow, davfs, clean): PHOTOPRISM_INIT: "update tensorflow clean" working_dir: "/photoprism" # do not change or remove diff --git a/setup/docker/docker-compose.yml b/setup/docker/docker-compose.yml index 96eaad1b8..328f4bb16 100644 --- a/setup/docker/docker-compose.yml +++ b/setup/docker/docker-compose.yml @@ -75,12 +75,12 @@ services: PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" # meta site description PHOTOPRISM_SITE_AUTHOR: "" # meta site author + ## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/): + # PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # video bitrate limit in Mbit/s (default: 50) ## Run/install on first startup (options: update https gpu tensorflow davfs clitools clean): # PHOTOPRISM_INIT: "https gpu tensorflow" - ## Hardware Video Transcoding: - # PHOTOPRISM_FFMPEG_ENCODER: "software" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "raspberry") - # PHOTOPRISM_FFMPEG_SIZE: "1920" # Maximum video size in PIXELS (720-7680) (default: 3840) - # PHOTOPRISM_FFMPEG_BITRATE: "32" # Maximum video BITRATE in Mbit/s (default: 50) ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200): # PHOTOPRISM_UID: 1000 # PHOTOPRISM_GID: 1000 diff --git a/setup/docker/macos/docker-compose.yml b/setup/docker/macos/docker-compose.yml index 6d2bd47d2..38c37dfc6 100644 --- a/setup/docker/macos/docker-compose.yml +++ b/setup/docker/macos/docker-compose.yml @@ -69,6 +69,10 @@ services: PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" # meta site description PHOTOPRISM_SITE_AUTHOR: "" # meta site author + ## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/): + # PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # video bitrate limit in Mbit/s (default: 50) ## Run/install on first startup (options: update https gpu tensorflow davfs clitools clean): # PHOTOPRISM_INIT: "https gpu tensorflow" ## Storage Folders: "~" is a shortcut for your home directory, "." for the current directory diff --git a/setup/docker/nvidia/docker-compose.yml b/setup/docker/nvidia/docker-compose.yml index bdb657923..fd890c3a2 100644 --- a/setup/docker/nvidia/docker-compose.yml +++ b/setup/docker/nvidia/docker-compose.yml @@ -79,15 +79,14 @@ services: PHOTOPRISM_SITE_DESCRIPTION: "" # meta site description PHOTOPRISM_SITE_AUTHOR: "" # meta site author PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" - ## Run/install on first startup: - PHOTOPRISM_INIT: "tensorflow" - ## Hardware Video Transcoding: - ## see https://docs.photoprism.app/getting-started/advanced/transcoding/#nvidia-container-toolkit - PHOTOPRISM_FFMPEG_ENCODER: "nvidia" - PHOTOPRISM_FFMPEG_SIZE: "1920" # Maximum video size in PIXELS (720-7680) (default: 3840) - PHOTOPRISM_FFMPEG_BITRATE: "32" # Maximum video BITRATE in Mbit/s (default: 50) + ## Hardware Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/): + PHOTOPRISM_FFMPEG_ENCODER: "nvidia" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # video bitrate limit in Mbit/s (default: 50) NVIDIA_VISIBLE_DEVICES: "all" NVIDIA_DRIVER_CAPABILITIES: "compute,video,utility" + ## Run/install on first startup: + PHOTOPRISM_INIT: "tensorflow" ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200): # PHOTOPRISM_UID: 1000 # PHOTOPRISM_GID: 1000 diff --git a/setup/docker/scheduler/docker-compose.yml b/setup/docker/scheduler/docker-compose.yml index 0fc4e88d2..46cab9277 100644 --- a/setup/docker/scheduler/docker-compose.yml +++ b/setup/docker/scheduler/docker-compose.yml @@ -73,6 +73,10 @@ services: PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" # meta site description PHOTOPRISM_SITE_AUTHOR: "" # meta site author + ## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/): + # PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # video bitrate limit in Mbit/s (default: 50) ## Run/install on first startup (options: update https gpu tensorflow davfs clitools clean): # PHOTOPRISM_INIT: "https gpu tensorflow" ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200): diff --git a/setup/docker/sqlite/docker-compose.yml b/setup/docker/sqlite/docker-compose.yml index 23fcc8124..1c4dbff02 100644 --- a/setup/docker/sqlite/docker-compose.yml +++ b/setup/docker/sqlite/docker-compose.yml @@ -66,6 +66,10 @@ services: PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" # meta site description PHOTOPRISM_SITE_AUTHOR: "" # meta site author + ## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/): + # PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # video bitrate limit in Mbit/s (default: 50) ## Run/install on first startup (options: update https gpu tensorflow davfs clitools clean): # PHOTOPRISM_INIT: "https gpu tensorflow" ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200): diff --git a/setup/docker/windows/docker-compose.yml b/setup/docker/windows/docker-compose.yml index fde88b706..54ace93f5 100644 --- a/setup/docker/windows/docker-compose.yml +++ b/setup/docker/windows/docker-compose.yml @@ -76,6 +76,10 @@ services: PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" # meta site description PHOTOPRISM_SITE_AUTHOR: "" # meta site author + ## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/): + # PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # video bitrate limit in Mbit/s (default: 50) working_dir: "/photoprism" # do not change or remove ## Storage Folders: use "/" not "\" as separator, "~" is a shortcut for C:/user/{username}, "." for the current directory volumes: diff --git a/setup/podman/docker-compose.yml b/setup/podman/docker-compose.yml index 0a7591e4e..b7e17a02a 100644 --- a/setup/podman/docker-compose.yml +++ b/setup/podman/docker-compose.yml @@ -79,12 +79,12 @@ services: PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" # meta site description PHOTOPRISM_SITE_AUTHOR: "" # meta site author + ## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/): + # PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # video bitrate limit in Mbit/s (default: 50) ## Run/install on first startup (options: update https gpu tensorflow davfs clitools clean): # PHOTOPRISM_INIT: "https gpu tensorflow" - ## Hardware Video Transcoding: - # PHOTOPRISM_FFMPEG_ENCODER: "software" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "raspberry") - # PHOTOPRISM_FFMPEG_SIZE: "1920" # Maximum video size in PIXELS (720-7680) (default: 3840) - # PHOTOPRISM_FFMPEG_BITRATE: "32" # Maximum video BITRATE in Mbit/s (default: 50) ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200): # PHOTOPRISM_UID: 1000 # PHOTOPRISM_GID: 1000