Skip to content

Commit e50dafe

Browse files
committed
Setup: Add OLLAMA_API_KEY and OLLAMA_BASE_URL to Compose files photoprism#5361
Signed-off-by: Michael Mayer <[email protected]>
1 parent 18889cc commit e50dafe

File tree

10 files changed

+43
-5
lines changed

10 files changed

+43
-5
lines changed

compose.nvidia.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ services:
121121
PHOTOPRISM_THUMB_UNCACHED: "true" # enables on-demand thumbnail rendering (high memory and cpu usage)
122122
## Run/install on first startup (options: update tensorflow https intel gpu davfs yt-dlp):
123123
PHOTOPRISM_INIT: "https tensorflow-gpu"
124-
## Computer Vision API (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
124+
## Computer Vision (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
125125
PHOTOPRISM_VISION_API: "true" # server: enables service API endpoints under /api/v1/vision (requires access token)
126126
PHOTOPRISM_VISION_URI: "" # client: service URI, e.g. http://hostname/api/v1/vision (leave blank to disable)
127127
PHOTOPRISM_VISION_KEY: "" # client: service access token (for authentication)

compose.postgres.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ services:
6868
PHOTOPRISM_JPEG_SIZE: 7680 # size limit for converted image files in pixels (720-30000)
6969
## Run/install on first startup (options: update tensorflow https intel gpu davfs yt-dlp):
7070
PHOTOPRISM_INIT: "https"
71+
## Computer Vision (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
72+
PHOTOPRISM_VISION_API: "true" # server: enables service API endpoints under /api/v1/vision (requires access token)
73+
PHOTOPRISM_VISION_URI: "" # client: service URI, e.g. http://hostname/api/v1/vision (leave blank to disable)
74+
PHOTOPRISM_VISION_KEY: "" # client: service access token (for authentication)
75+
OLLAMA_BASE_URL: "http://ollama:11434" # use "https://ollama.com" for Ollama Cloud
76+
OLLAMA_API_KEY: "" # API key required to access Ollama (optional)
7177
## External dependencies and tools:
7278
TF_CPP_MIN_LOG_LEVEL: 1
7379
GOCACHE: "/go/src/github.com/photoprism/photoprism/.local/gocache"

compose.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,12 @@ services:
131131
# PHOTOPRISM_FFMPEG_BITRATE: "64" # video bitrate limit in Mbps (default: 60)
132132
## Run/install on first startup (options: update tensorflow https intel gpu davfs yt-dlp):
133133
PHOTOPRISM_INIT: "https"
134-
## Computer Vision API (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
134+
## Computer Vision (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
135135
PHOTOPRISM_VISION_API: "true" # server: enables service API endpoints under /api/v1/vision (requires access token)
136136
PHOTOPRISM_VISION_URI: "" # client: service URI, e.g. http://hostname/api/v1/vision (leave blank to disable)
137137
PHOTOPRISM_VISION_KEY: "" # client: service access token (for authentication)
138+
OLLAMA_BASE_URL: "http://ollama:11434" # use "https://ollama.com" for Ollama Cloud
139+
OLLAMA_API_KEY: "" # API key required to access Ollama (optional)
138140
## External dependencies and tools:
139141
TF_CPP_MIN_LOG_LEVEL: 1
140142
GOCACHE: "/go/src/github.com/photoprism/photoprism/.local/gocache"

setup/docker/arm64/compose.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,12 @@ services:
101101
PHOTOPRISM_DATABASE_PASSWORD: "insecure" # MariaDB database password, must be the same as MARIADB_PASSWORD
102102
## Run/install on first startup (https://docs.photoprism.app/getting-started/config-options/#docker-image):
103103
PHOTOPRISM_INIT: "https yt-dlp" # options: update https tensorflow tensorflow-gpu intel gpu davfs yt-dlp
104-
## Computer Vision API (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
104+
## Computer Vision (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
105105
PHOTOPRISM_VISION_API: "false" # server: enables service API endpoints under /api/v1/vision (requires access token)
106106
PHOTOPRISM_VISION_URI: "" # client: service URI, e.g. http://hostname/api/v1/vision (leave blank to disable)
107107
PHOTOPRISM_VISION_KEY: "" # client: service access token (for authentication)
108+
OLLAMA_BASE_URL: "http://ollama:11434" # use "https://ollama.com" for Ollama Cloud
109+
OLLAMA_API_KEY: "" # API key required to access Ollama (optional)
108110
## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/):
109111
# PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi)
110112
# PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840)

setup/docker/compose.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,12 @@ services:
9191
PHOTOPRISM_DATABASE_PASSWORD: "insecure" # MariaDB database password, must be the same as MARIADB_PASSWORD
9292
## Run/install on first startup (https://docs.photoprism.app/getting-started/config-options/#docker-image):
9393
PHOTOPRISM_INIT: "https tensorflow" # options: update https tensorflow tensorflow-gpu intel gpu davfs yt-dlp
94-
## Computer Vision API (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
94+
## Computer Vision (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
9595
PHOTOPRISM_VISION_API: "false" # server: enables service API endpoints under /api/v1/vision (requires access token)
9696
PHOTOPRISM_VISION_URI: "" # client: service URI, e.g. http://hostname/api/v1/vision (leave blank to disable)
9797
PHOTOPRISM_VISION_KEY: "" # client: service access token (for authentication)
98+
OLLAMA_BASE_URL: "http://ollama:11434" # use "https://ollama.com" for Ollama Cloud
99+
OLLAMA_API_KEY: "" # API key required to access Ollama (optional)
98100
## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/):
99101
# PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi)
100102
# PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840)

setup/docker/macos/compose.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ services:
8484
PHOTOPRISM_SITE_AUTHOR: "" # meta site author
8585
## Run/install on first startup, see https://github.com/photoprism/photoprism/blob/develop/scripts/dist/Makefile:
8686
PHOTOPRISM_INIT: "https tensorflow" # common options: update https tensorflow tensorflow-gpu intel gpu davfs yt-dlp
87+
## Computer Vision (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
88+
PHOTOPRISM_VISION_API: "false" # server: enables service API endpoints under /api/v1/vision (requires access token)
89+
PHOTOPRISM_VISION_URI: "" # client: service URI, e.g. http://hostname/api/v1/vision (leave blank to disable)
90+
PHOTOPRISM_VISION_KEY: "" # client: service access token (for authentication)
91+
OLLAMA_BASE_URL: "http://ollama:11434" # use "https://ollama.com" for Ollama Cloud
92+
OLLAMA_API_KEY: "" # API key required to access Ollama (optional)
8793
## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/):
8894
# PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi)
8995
# PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840)

setup/docker/nvidia/compose.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,12 @@ services:
9595
PHOTOPRISM_DATABASE_PASSWORD: "insecure" # MariaDB database password, must be the same as MARIADB_PASSWORD
9696
## Run/install on first startup, see https://github.com/photoprism/photoprism/blob/develop/scripts/dist/Makefile:
9797
PHOTOPRISM_INIT: "https tensorflow-gpu yt-dlp" # common options: update https tensorflow tensorflow-gpu intel gpu davfs yt-dlp
98-
## Computer Vision API (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
98+
## Computer Vision (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
9999
PHOTOPRISM_VISION_API: "false" # server: enables service API endpoints under /api/v1/vision (requires access token)
100100
PHOTOPRISM_VISION_URI: "" # client: service URI, e.g. http://hostname/api/v1/vision (leave blank to disable)
101101
PHOTOPRISM_VISION_KEY: "" # client: service access token (for authentication)
102+
OLLAMA_BASE_URL: "http://ollama:11434" # use "https://ollama.com" for Ollama Cloud
103+
OLLAMA_API_KEY: "" # API key required to access Ollama (optional)
102104
## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/):
103105
PHOTOPRISM_FFMPEG_ENCODER: "nvidia" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi)
104106
PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840)

setup/docker/scheduler/compose.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@ services:
8888
PHOTOPRISM_SITE_AUTHOR: "" # meta site author
8989
## Run/install on first startup, see https://github.com/photoprism/photoprism/blob/develop/scripts/dist/Makefile:
9090
PHOTOPRISM_INIT: "https tensorflow" # common options: update https tensorflow tensorflow-gpu intel gpu davfs yt-dlp
91+
## Computer Vision (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
92+
PHOTOPRISM_VISION_API: "false" # server: enables service API endpoints under /api/v1/vision (requires access token)
93+
PHOTOPRISM_VISION_URI: "" # client: service URI, e.g. http://hostname/api/v1/vision (leave blank to disable)
94+
PHOTOPRISM_VISION_KEY: "" # client: service access token (for authentication)
95+
OLLAMA_BASE_URL: "http://ollama:11434" # use "https://ollama.com" for Ollama Cloud
96+
OLLAMA_API_KEY: "" # API key required to access Ollama (optional)
9197
## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/):
9298
# PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi)
9399
# PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840)

setup/docker/sqlite/compose.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ services:
8181
PHOTOPRISM_SITE_AUTHOR: "" # meta site author
8282
## Run/install on first startup, see https://github.com/photoprism/photoprism/blob/develop/scripts/dist/Makefile:
8383
PHOTOPRISM_INIT: "https tensorflow" # common options: update https tensorflow tensorflow-gpu intel gpu davfs yt-dlp
84+
## Computer Vision (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
85+
PHOTOPRISM_VISION_API: "false" # server: enables service API endpoints under /api/v1/vision (requires access token)
86+
PHOTOPRISM_VISION_URI: "" # client: service URI, e.g. http://hostname/api/v1/vision (leave blank to disable)
87+
PHOTOPRISM_VISION_KEY: "" # client: service access token (for authentication)
88+
OLLAMA_BASE_URL: "http://ollama:11434" # use "https://ollama.com" for Ollama Cloud
89+
OLLAMA_API_KEY: "" # API key required to access Ollama (optional)
8490
## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/):
8591
# PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi)
8692
# PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840)

setup/docker/windows/compose.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@ services:
8989
PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App"
9090
PHOTOPRISM_SITE_DESCRIPTION: "" # meta site description
9191
PHOTOPRISM_SITE_AUTHOR: "" # meta site author
92+
## Computer Vision (https://docs.photoprism.app/getting-started/config-options/#computer-vision):
93+
PHOTOPRISM_VISION_API: "false" # server: enables service API endpoints under /api/v1/vision (requires access token)
94+
PHOTOPRISM_VISION_URI: "" # client: service URI, e.g. http://hostname/api/v1/vision (leave blank to disable)
95+
PHOTOPRISM_VISION_KEY: "" # client: service access token (for authentication)
96+
OLLAMA_BASE_URL: "http://ollama:11434" # use "https://ollama.com" for Ollama Cloud
97+
OLLAMA_API_KEY: "" # API key required to access Ollama (optional)
9298
## Video Transcoding (https://docs.photoprism.app/getting-started/advanced/transcoding/):
9399
# PHOTOPRISM_FFMPEG_ENCODER: "software" # H.264/AVC encoder (software, intel, nvidia, apple, raspberry, or vaapi)
94100
# PHOTOPRISM_FFMPEG_SIZE: "1920" # video size limit in pixels (720-7680) (default: 3840)

0 commit comments

Comments
 (0)