AI: Remove OLLAMA_BASE_URL default from Dockerfiles #5361

Signed-off-by: Michael Mayer <michael@photoprism.app>
2025-12-11 16:24:11 +01:00 · 2025-12-10 11:09:37 +01:00
parent 4e18b689fe
commit 18889cc21f
33 changed files with 15 additions and 48 deletions
--- a/docker/develop/armv7/Dockerfile
+++ b/docker/develop/armv7/Dockerfile
@@ -38,7 +38,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    GO111MODULE="on" \
    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    S6_KEEP_ENV=1 \
    S6_VERBOSITY=0 \
    S6_LOGGING=0
--- a/docker/develop/bookworm-slim/Dockerfile
+++ b/docker/develop/bookworm-slim/Dockerfile
@@ -32,8 +32,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_CPP_MIN_LOG_LEVEL=4 \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"

 # Copy scripts and package sources config.
 COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
--- a/docker/develop/bookworm/Dockerfile
+++ b/docker/develop/bookworm/Dockerfile
@@ -37,8 +37,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    GOBIN="/usr/local/bin" \
    GO111MODULE="on" \
    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"

 # Copy scripts and package sources config.
 COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
--- a/docker/develop/bullseye-slim/Dockerfile
+++ b/docker/develop/bullseye-slim/Dockerfile
@@ -32,8 +32,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_CPP_MIN_LOG_LEVEL=4 \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"

 # copy scripts and debian backports sources list
 COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
--- a/docker/develop/bullseye/Dockerfile
+++ b/docker/develop/bullseye/Dockerfile
@@ -37,8 +37,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    GOBIN="/usr/local/bin" \
    GO111MODULE="on" \
    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"

 # copy scripts and debian backports sources list
 COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
--- a/docker/develop/buster/Dockerfile
+++ b/docker/develop/buster/Dockerfile
@@ -37,8 +37,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    GOBIN="/usr/local/bin" \
    GO111MODULE="on" \
    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"

 # copy scripts and debian backports sources list
 COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
--- a/docker/develop/impish/Dockerfile
+++ b/docker/develop/impish/Dockerfile
@@ -37,8 +37,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    GOBIN="/usr/local/bin" \
    GO111MODULE="on" \
    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"

 # copy scripts and debian backports sources list
 COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
--- a/docker/develop/jammy-slim/Dockerfile
+++ b/docker/develop/jammy-slim/Dockerfile
@@ -33,7 +33,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    S6_KEEP_ENV=0 \
    S6_VERBOSITY=0 \
    S6_LOGGING=0
--- a/docker/develop/jammy/Dockerfile
+++ b/docker/develop/jammy/Dockerfile
@@ -38,7 +38,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    GO111MODULE="on" \
    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    S6_KEEP_ENV=1 \
    S6_VERBOSITY=0 \
    S6_LOGGING=0
--- a/docker/develop/lunar-slim/Dockerfile
+++ b/docker/develop/lunar-slim/Dockerfile
@@ -32,8 +32,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_CPP_MIN_LOG_LEVEL=4 \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"

 # Copy scripts and package sources config.
 COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
--- a/docker/develop/lunar/Dockerfile
+++ b/docker/develop/lunar/Dockerfile
@@ -37,8 +37,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    GOBIN="/usr/local/bin" \
    GO111MODULE="on" \
    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"

 # Copy scripts and package sources config.
 COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
--- a/docker/develop/mantic-slim/Dockerfile
+++ b/docker/develop/mantic-slim/Dockerfile
@@ -32,8 +32,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_CPP_MIN_LOG_LEVEL=4 \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"

 # Copy scripts and package sources config.
 COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
--- a/docker/develop/mantic/Dockerfile
+++ b/docker/develop/mantic/Dockerfile
@@ -37,8 +37,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    GOBIN="/usr/local/bin" \
    GO111MODULE="on" \
    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"

 # Copy scripts and package sources config.
 COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
--- a/docker/develop/noble-slim/Dockerfile
+++ b/docker/develop/noble-slim/Dockerfile
@@ -32,8 +32,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_CPP_MIN_LOG_LEVEL=4 \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"

 # Copy scripts and package sources config.
 COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
--- a/docker/develop/noble/Dockerfile
+++ b/docker/develop/noble/Dockerfile
@@ -37,8 +37,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    GOBIN="/usr/local/bin" \
    GO111MODULE="on" \
    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"

 # Copy scripts and package sources config.
 COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
--- a/docker/develop/oracular-slim/Dockerfile
+++ b/docker/develop/oracular-slim/Dockerfile
@@ -33,7 +33,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    S6_KEEP_ENV=0 \
    S6_VERBOSITY=0 \
    S6_LOGGING=0
--- a/docker/develop/oracular/Dockerfile
+++ b/docker/develop/oracular/Dockerfile
@@ -38,7 +38,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    GO111MODULE="on" \
    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    S6_KEEP_ENV=1 \
    S6_VERBOSITY=0 \
    S6_LOGGING=0
--- a/docker/develop/plucky-slim/Dockerfile
+++ b/docker/develop/plucky-slim/Dockerfile
@@ -33,7 +33,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    S6_KEEP_ENV=0 \
    S6_VERBOSITY=0 \
    S6_LOGGING=0
--- a/docker/develop/plucky/Dockerfile
+++ b/docker/develop/plucky/Dockerfile
@@ -38,7 +38,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    GO111MODULE="on" \
    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    S6_KEEP_ENV=1 \
    S6_VERBOSITY=0 \
    S6_LOGGING=0
--- a/docker/develop/questing-slim/Dockerfile
+++ b/docker/develop/questing-slim/Dockerfile
@@ -32,8 +32,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_CPP_MIN_LOG_LEVEL=4 \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"
    S6_KEEP_ENV=0 \
    S6_VERBOSITY=0 \
    S6_LOGGING=0
--- a/docker/develop/questing/Dockerfile
+++ b/docker/develop/questing/Dockerfile
@@ -37,8 +37,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    GOBIN="/usr/local/bin" \
    GO111MODULE="on" \
    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"
    S6_KEEP_ENV=1 \
    S6_VERBOSITY=0 \
    S6_LOGGING=0
--- a/docker/photoprism/armv7/Dockerfile
+++ b/docker/photoprism/armv7/Dockerfile
@@ -49,8 +49,7 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_VERSION=1.15.2 \
    TF_CPP_MIN_LOG_LEVEL=4 \
    MALLOC_ARENA_MAX=2 \
-    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434"
+    PROG="photoprism"
    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
--- a/docker/photoprism/bookworm/Dockerfile
+++ b/docker/photoprism/bookworm/Dockerfile
@@ -45,7 +45,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
--- a/docker/photoprism/bullseye/Dockerfile
+++ b/docker/photoprism/bullseye/Dockerfile
@@ -45,7 +45,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
--- a/docker/photoprism/buster/Dockerfile
+++ b/docker/photoprism/buster/Dockerfile
@@ -48,7 +48,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
--- a/docker/photoprism/impish/Dockerfile
+++ b/docker/photoprism/impish/Dockerfile
@@ -48,7 +48,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
--- a/docker/photoprism/jammy/Dockerfile
+++ b/docker/photoprism/jammy/Dockerfile
@@ -46,7 +46,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
--- a/docker/photoprism/lunar/Dockerfile
+++ b/docker/photoprism/lunar/Dockerfile
@@ -46,7 +46,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
--- a/docker/photoprism/mantic/Dockerfile
+++ b/docker/photoprism/mantic/Dockerfile
@@ -46,7 +46,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
--- a/docker/photoprism/noble/Dockerfile
+++ b/docker/photoprism/noble/Dockerfile
@@ -46,7 +46,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
--- a/docker/photoprism/oracular/Dockerfile
+++ b/docker/photoprism/oracular/Dockerfile
@@ -46,7 +46,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
--- a/docker/photoprism/plucky/Dockerfile
+++ b/docker/photoprism/plucky/Dockerfile
@@ -46,7 +46,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
--- a/docker/photoprism/questing/Dockerfile
+++ b/docker/photoprism/questing/Dockerfile
@@ -46,7 +46,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
    TF_ENABLE_ONEDNN_OPTS=1 \
    MALLOC_ARENA_MAX=2 \
    PROG="photoprism" \
-    OLLAMA_BASE_URL="http://ollama:11434" \
    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \