From 1f47a3e2b84428912160285d0def9efc2bb99bc9 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Wed, 23 Feb 2022 14:24:50 +0100 Subject: [PATCH] Docker: Update default site caption and fix demo template --- cmd/photoprism/photoprism.go | 2 +- docker-compose.ci.yml | 2 +- docker-compose.latest.yml | 2 +- docker-compose.postgres.yml | 2 +- docker-compose.yml | 4 ++-- docker/demo/Dockerfile | 4 ++-- docker/demo/docker-compose.yml | 2 +- docker/examples/arm64/docker-compose.yml | 2 +- docker/examples/armv7/docker-compose.yml | 2 +- docker/examples/cloud/docker-compose.yml | 2 +- docker/examples/docker-compose.yml | 2 +- docker/examples/macos/docker-compose.yml | 2 +- docker/examples/scheduler/docker-compose.yml | 2 +- docker/examples/sqlite/docker-compose.yml | 2 +- docker/examples/windows/docker-compose.yml | 2 +- docker/photoprism/armv7/Dockerfile | 4 ++-- docker/photoprism/bullseye/Dockerfile | 4 ++-- docker/photoprism/buster/Dockerfile | 4 ++-- docker/photoprism/impish/Dockerfile | 4 ++-- frontend/src/common/config.js | 2 +- frontend/tests/unit/config.js | 2 +- internal/config/flags.go | 2 +- 22 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cmd/photoprism/photoprism.go b/cmd/photoprism/photoprism.go index 73b6490d4..b0824da8f 100644 --- a/cmd/photoprism/photoprism.go +++ b/cmd/photoprism/photoprism.go @@ -44,7 +44,7 @@ func main() { app := cli.NewApp() app.Name = "PhotoPrism" app.HelpName = filepath.Base(os.Args[0]) - app.Usage = "Browse Your Life in Pictures" + app.Usage = "AI-Powered Photos App" app.Description = appDescription app.Version = version app.Copyright = appCopyright diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index f1108b996..1965fb690 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -19,7 +19,7 @@ services: environment: PHOTOPRISM_SITE_URL: "http://localhost:2342/" PHOTOPRISM_SITE_TITLE: "PhotoPrism" - PHOTOPRISM_SITE_CAPTION: "Browse Your Life" + PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "Open-Source Photo Management" PHOTOPRISM_SITE_AUTHOR: "@photoprism_app" PHOTOPRISM_DEBUG: "false" diff --git a/docker-compose.latest.yml b/docker-compose.latest.yml index 19cd8b27f..7d2301e46 100644 --- a/docker-compose.latest.yml +++ b/docker-compose.latest.yml @@ -26,7 +26,7 @@ services: ## Public server URL incl http:// or https:// and /path, :port is optional PHOTOPRISM_SITE_URL: "https://latest.localssl.dev/" PHOTOPRISM_SITE_TITLE: "PhotoPrism" - PHOTOPRISM_SITE_CAPTION: "Browse Your Life" + PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "Open-Source Photo Management" PHOTOPRISM_SITE_AUTHOR: "@photoprism_app" PHOTOPRISM_DEBUG: "true" diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml index 6c821c892..079f225fa 100644 --- a/docker-compose.postgres.yml +++ b/docker-compose.postgres.yml @@ -31,7 +31,7 @@ services: environment: PHOTOPRISM_SITE_URL: "http://localhost:2342/" PHOTOPRISM_SITE_TITLE: "PhotoPrism" - PHOTOPRISM_SITE_CAPTION: "Browse Your Life" + PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "Open-Source Photo Management" PHOTOPRISM_SITE_AUTHOR: "@photoprism_app" PHOTOPRISM_DEBUG: "true" diff --git a/docker-compose.yml b/docker-compose.yml index 005c8b997..33714d4e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,8 +62,8 @@ services: ## External development server URL incl http:// or https:// and /path, :port is optional PHOTOPRISM_SITE_URL: "https://app.localssl.dev/" PHOTOPRISM_SITE_TITLE: "PhotoPrism" - PHOTOPRISM_SITE_CAPTION: "Browse Your Life" - PHOTOPRISM_SITE_DESCRIPTION: "AI-Powered Photos App. Tags and finds pictures without getting in your way!" + PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" + PHOTOPRISM_SITE_DESCRIPTION: "Tags and finds pictures without getting in your way!" PHOTOPRISM_SITE_AUTHOR: "@photoprism_app" PHOTOPRISM_DEBUG: "true" PHOTOPRISM_READONLY: "false" diff --git a/docker/demo/Dockerfile b/docker/demo/Dockerfile index 78ff551d5..95a6c7056 100644 --- a/docker/demo/Dockerfile +++ b/docker/demo/Dockerfile @@ -20,10 +20,10 @@ ENV TF_CPP_MIN_LOG_LEVEL=2 \ PHOTOPRISM_APP_ICON="favicon" \ PHOTOPRISM_SITE_TITLE="PhotoPrism" \ PHOTOPRISM_SITE_CAPTION="Demo" \ - PHOTOPRISM_SITE_DESCRIPTION="AI-Powered Photos App. Tags and finds pictures without getting in your way!" + PHOTOPRISM_SITE_DESCRIPTION="Tags and finds pictures without getting in your way!" # Copy assets -COPY /docker/demo/index.tmpl /photoprism/assets/templates +COPY /docker/demo/index.tmpl /opt/photoprism/assets/templates # Download example photos RUN wget -qO- https://dl.photoprism.app/qa/demo.tar.gz | tar xvz -C /photoprism/originals diff --git a/docker/demo/docker-compose.yml b/docker/demo/docker-compose.yml index f08bb4b17..2b87a43f7 100644 --- a/docker/demo/docker-compose.yml +++ b/docker/demo/docker-compose.yml @@ -20,7 +20,7 @@ services: # PHOTOPRISM_CDN_URL: "https://demo-cdn.yourdomain.com/" PHOTOPRISM_SITE_TITLE: "PhotoPrism" PHOTOPRISM_SITE_CAPTION: "Demo" - PHOTOPRISM_SITE_DESCRIPTION: "AI-Powered Photos App. Tags and finds pictures without getting in your way!" + PHOTOPRISM_SITE_DESCRIPTION: "Tags and finds pictures without getting in your way!" PHOTOPRISM_SITE_PREVIEW: "https://i.photoprism.app/logo?cover=17&title=Demo" PHOTOPRISM_SITE_AUTHOR: "PhotoPrism" PHOTOPRISM_HTTP_COMPRESSION: "gzip" diff --git a/docker/examples/arm64/docker-compose.yml b/docker/examples/arm64/docker-compose.yml index e3f2533eb..0d84fcf95 100644 --- a/docker/examples/arm64/docker-compose.yml +++ b/docker/examples/arm64/docker-compose.yml @@ -88,7 +88,7 @@ services: PHOTOPRISM_DATABASE_USER: "photoprism" # MariaDB or MySQL database user name PHOTOPRISM_DATABASE_PASSWORD: "insecure" # MariaDB or MySQL database user password PHOTOPRISM_SITE_TITLE: "PhotoPrism" - PHOTOPRISM_SITE_CAPTION: "Browse Your Life" + PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" PHOTOPRISM_SITE_AUTHOR: "" ## Run as a specific user, group, or with a custom umask (does not work together with "user:") diff --git a/docker/examples/armv7/docker-compose.yml b/docker/examples/armv7/docker-compose.yml index 800ceb508..5f26587e6 100644 --- a/docker/examples/armv7/docker-compose.yml +++ b/docker/examples/armv7/docker-compose.yml @@ -81,7 +81,7 @@ services: PHOTOPRISM_DATABASE_USER: "photoprism" # MariaDB or MySQL database user name PHOTOPRISM_DATABASE_PASSWORD: "insecure" # MariaDB or MySQL database user password PHOTOPRISM_SITE_TITLE: "PhotoPrism" - PHOTOPRISM_SITE_CAPTION: "Browse Your Life" + PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" PHOTOPRISM_SITE_AUTHOR: "" ## Run as a specific user, group, or with a custom umask (does not work together with "user:") diff --git a/docker/examples/cloud/docker-compose.yml b/docker/examples/cloud/docker-compose.yml index 6fc5f9a75..8c51a39df 100644 --- a/docker/examples/cloud/docker-compose.yml +++ b/docker/examples/cloud/docker-compose.yml @@ -130,7 +130,7 @@ services: ## !! CHANGE site url if your server has a public domain name e.g. "https://photos.yourdomain.com/" !! PHOTOPRISM_SITE_URL: "https://_public_ip_/" PHOTOPRISM_SITE_TITLE: "PhotoPrism" - PHOTOPRISM_SITE_CAPTION: "Browse Your Life" + PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" PHOTOPRISM_SITE_AUTHOR: "" PHOTOPRISM_ADMIN_PASSWORD: "_admin_password_" # YOUR INITIAL "admin" PASSWORD diff --git a/docker/examples/docker-compose.yml b/docker/examples/docker-compose.yml index fad790e3b..5d705c249 100644 --- a/docker/examples/docker-compose.yml +++ b/docker/examples/docker-compose.yml @@ -76,7 +76,7 @@ services: PHOTOPRISM_DATABASE_USER: "photoprism" # MariaDB or MySQL database user name PHOTOPRISM_DATABASE_PASSWORD: "insecure" # MariaDB or MySQL database user password PHOTOPRISM_SITE_TITLE: "PhotoPrism" - PHOTOPRISM_SITE_CAPTION: "Browse Your Life" + PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" PHOTOPRISM_SITE_AUTHOR: "" ## Hardware video transcoding config (optional) diff --git a/docker/examples/macos/docker-compose.yml b/docker/examples/macos/docker-compose.yml index 5c15749de..066f6cf06 100644 --- a/docker/examples/macos/docker-compose.yml +++ b/docker/examples/macos/docker-compose.yml @@ -72,7 +72,7 @@ services: PHOTOPRISM_DATABASE_USER: "photoprism" # MariaDB or MySQL database user name PHOTOPRISM_DATABASE_PASSWORD: "insecure" # MariaDB or MySQL database user password PHOTOPRISM_SITE_TITLE: "PhotoPrism" - PHOTOPRISM_SITE_CAPTION: "Browse Your Life" + PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" PHOTOPRISM_SITE_AUTHOR: "" ## Enable TensorFlow AVX2 support for modern Intel CPUs (requires starting the container as root) diff --git a/docker/examples/scheduler/docker-compose.yml b/docker/examples/scheduler/docker-compose.yml index df60d8913..5b9f77459 100644 --- a/docker/examples/scheduler/docker-compose.yml +++ b/docker/examples/scheduler/docker-compose.yml @@ -78,7 +78,7 @@ services: PHOTOPRISM_DATABASE_USER: "photoprism" # MariaDB or MySQL database user name PHOTOPRISM_DATABASE_PASSWORD: "insecure" # MariaDB or MySQL database user password PHOTOPRISM_SITE_TITLE: "PhotoPrism" - PHOTOPRISM_SITE_CAPTION: "Browse Your Life" + PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" PHOTOPRISM_SITE_AUTHOR: "" ## Enable TensorFlow AVX2 support for modern Intel CPUs (requires starting the container as root) diff --git a/docker/examples/sqlite/docker-compose.yml b/docker/examples/sqlite/docker-compose.yml index a35b81e80..e2a595d58 100644 --- a/docker/examples/sqlite/docker-compose.yml +++ b/docker/examples/sqlite/docker-compose.yml @@ -71,7 +71,7 @@ services: PHOTOPRISM_UPLOAD_NSFW: "true" # allows uploads that MAY be offensive PHOTOPRISM_DATABASE_DRIVER: "sqlite" # SQLite is an embedded database that doesn't require a server PHOTOPRISM_SITE_TITLE: "PhotoPrism" - PHOTOPRISM_SITE_CAPTION: "Browse Your Life" + PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" PHOTOPRISM_SITE_AUTHOR: "" ## Enable TensorFlow AVX2 support for modern Intel CPUs (requires starting the container as root) diff --git a/docker/examples/windows/docker-compose.yml b/docker/examples/windows/docker-compose.yml index 9fdca9529..fb00e0847 100644 --- a/docker/examples/windows/docker-compose.yml +++ b/docker/examples/windows/docker-compose.yml @@ -77,7 +77,7 @@ services: PHOTOPRISM_DATABASE_USER: "photoprism" # MariaDB or MySQL database user name PHOTOPRISM_DATABASE_PASSWORD: "insecure" # MariaDB or MySQL database user password PHOTOPRISM_SITE_TITLE: "PhotoPrism" - PHOTOPRISM_SITE_CAPTION: "Browse Your Life" + PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "" PHOTOPRISM_SITE_AUTHOR: "" HOME: "/photoprism" diff --git a/docker/photoprism/armv7/Dockerfile b/docker/photoprism/armv7/Dockerfile index 746c3782c..4adfea694 100644 --- a/docker/photoprism/armv7/Dockerfile +++ b/docker/photoprism/armv7/Dockerfile @@ -28,9 +28,9 @@ ENV DOCKER_ARCH=$TARGETARCH \ TMPDIR="/tmp" \ DEBIAN_FRONTEND="noninteractive" \ TF_CPP_MIN_LOG_LEVEL="2" \ + PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \ PHOTOPRISM_IMPORT_PATH="/photoprism/import" \ PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \ - PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \ PHOTOPRISM_STORAGE_PATH="/photoprism/storage" \ PHOTOPRISM_BACKUP_PATH="/photoprism/storage/backups" \ PHOTOPRISM_LOG_FILENAME="/photoprism/storage/photoprism.log" \ @@ -43,7 +43,7 @@ ENV DOCKER_ARCH=$TARGETARCH \ PHOTOPRISM_EXPERIMENTAL="false" \ PHOTOPRISM_SITE_URL="http://localhost:2342/" \ PHOTOPRISM_SITE_TITLE="PhotoPrism" \ - PHOTOPRISM_SITE_CAPTION="Browse Your Life" \ + PHOTOPRISM_SITE_CAPTION="AI-Powered Photos App" \ PHOTOPRISM_SITE_DESCRIPTION="" \ PHOTOPRISM_SITE_AUTHOR="" \ PHOTOPRISM_HTTP_HOST="0.0.0.0" \ diff --git a/docker/photoprism/bullseye/Dockerfile b/docker/photoprism/bullseye/Dockerfile index c1b39965c..496657e37 100644 --- a/docker/photoprism/bullseye/Dockerfile +++ b/docker/photoprism/bullseye/Dockerfile @@ -28,9 +28,9 @@ ENV DOCKER_ARCH=$TARGETARCH \ TMPDIR="/tmp" \ DEBIAN_FRONTEND="noninteractive" \ TF_CPP_MIN_LOG_LEVEL="2" \ + PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \ PHOTOPRISM_IMPORT_PATH="/photoprism/import" \ PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \ - PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \ PHOTOPRISM_STORAGE_PATH="/photoprism/storage" \ PHOTOPRISM_BACKUP_PATH="/photoprism/storage/backups" \ PHOTOPRISM_LOG_FILENAME="/photoprism/storage/photoprism.log" \ @@ -43,7 +43,7 @@ ENV DOCKER_ARCH=$TARGETARCH \ PHOTOPRISM_EXPERIMENTAL="false" \ PHOTOPRISM_SITE_URL="http://localhost:2342/" \ PHOTOPRISM_SITE_TITLE="PhotoPrism" \ - PHOTOPRISM_SITE_CAPTION="Browse Your Life" \ + PHOTOPRISM_SITE_CAPTION="AI-Powered Photos App" \ PHOTOPRISM_SITE_DESCRIPTION="" \ PHOTOPRISM_SITE_AUTHOR="" \ PHOTOPRISM_HTTP_HOST="0.0.0.0" \ diff --git a/docker/photoprism/buster/Dockerfile b/docker/photoprism/buster/Dockerfile index a0eb17863..7b399daab 100644 --- a/docker/photoprism/buster/Dockerfile +++ b/docker/photoprism/buster/Dockerfile @@ -28,9 +28,9 @@ ENV DOCKER_ARCH=$TARGETARCH \ TMPDIR="/tmp" \ DEBIAN_FRONTEND="noninteractive" \ TF_CPP_MIN_LOG_LEVEL="2" \ + PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \ PHOTOPRISM_IMPORT_PATH="/photoprism/import" \ PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \ - PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \ PHOTOPRISM_STORAGE_PATH="/photoprism/storage" \ PHOTOPRISM_BACKUP_PATH="/photoprism/storage/backups" \ PHOTOPRISM_LOG_FILENAME="/photoprism/storage/photoprism.log" \ @@ -43,7 +43,7 @@ ENV DOCKER_ARCH=$TARGETARCH \ PHOTOPRISM_EXPERIMENTAL="false" \ PHOTOPRISM_SITE_URL="http://localhost:2342/" \ PHOTOPRISM_SITE_TITLE="PhotoPrism" \ - PHOTOPRISM_SITE_CAPTION="Browse Your Life" \ + PHOTOPRISM_SITE_CAPTION="AI-Powered Photos App" \ PHOTOPRISM_SITE_DESCRIPTION="" \ PHOTOPRISM_SITE_AUTHOR="" \ PHOTOPRISM_HTTP_HOST="0.0.0.0" \ diff --git a/docker/photoprism/impish/Dockerfile b/docker/photoprism/impish/Dockerfile index 07a8976e8..e240f4d2e 100644 --- a/docker/photoprism/impish/Dockerfile +++ b/docker/photoprism/impish/Dockerfile @@ -28,9 +28,9 @@ ENV DOCKER_ARCH=$TARGETARCH \ TMPDIR="/tmp" \ DEBIAN_FRONTEND="noninteractive" \ TF_CPP_MIN_LOG_LEVEL="2" \ + PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \ PHOTOPRISM_IMPORT_PATH="/photoprism/import" \ PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \ - PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \ PHOTOPRISM_STORAGE_PATH="/photoprism/storage" \ PHOTOPRISM_BACKUP_PATH="/photoprism/storage/backups" \ PHOTOPRISM_LOG_FILENAME="/photoprism/storage/photoprism.log" \ @@ -43,7 +43,7 @@ ENV DOCKER_ARCH=$TARGETARCH \ PHOTOPRISM_EXPERIMENTAL="false" \ PHOTOPRISM_SITE_URL="http://localhost:2342/" \ PHOTOPRISM_SITE_TITLE="PhotoPrism" \ - PHOTOPRISM_SITE_CAPTION="Browse Your Life" \ + PHOTOPRISM_SITE_CAPTION="AI-Powered Photos App" \ PHOTOPRISM_SITE_DESCRIPTION="" \ PHOTOPRISM_SITE_AUTHOR="" \ PHOTOPRISM_HTTP_HOST="0.0.0.0" \ diff --git a/frontend/src/common/config.js b/frontend/src/common/config.js index 42263d4b4..b624bf64c 100644 --- a/frontend/src/common/config.js +++ b/frontend/src/common/config.js @@ -59,7 +59,7 @@ export default class Config { this.values = {}; this.page = { title: "PhotoPrism", - caption: "Browse Your Life", + caption: "AI-Powered Photos App", }; return; } else { diff --git a/frontend/tests/unit/config.js b/frontend/tests/unit/config.js index 912577c2c..8d88d35dd 100644 --- a/frontend/tests/unit/config.js +++ b/frontend/tests/unit/config.js @@ -11,7 +11,7 @@ const clientConfig = { siteUrl: "http://localhost:2342/", sitePreview: "http://localhost:2342/static/img/preview.jpg", siteTitle: "PhotoPrism", - siteCaption: "Browse Your Life", + siteCaption: "AI-Powered Photos App", siteDescription: "Open-Source Photo Management", siteAuthor: "@photoprism_app", debug: false, diff --git a/internal/config/flags.go b/internal/config/flags.go index 6c188615d..041ba27fa 100644 --- a/internal/config/flags.go +++ b/internal/config/flags.go @@ -279,7 +279,7 @@ var GlobalFlags = []cli.Flag{ cli.StringFlag{ Name: "site-caption", Usage: "site `CAPTION`", - Value: "Browse Your Life", + Value: "AI-Powered Photos App", EnvVar: "PHOTOPRISM_SITE_CAPTION", }, cli.StringFlag{