photoprism

Websoft9 · Oct 9, 2024 · a6aff5f · a6aff5f
1 parent f0364fd
commit a6aff5f
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 88 deletions.
diff --git a/apps/photoprism/.env b/apps/photoprism/.env
@@ -7,25 +7,64 @@ W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
 W9_ID=photoprism
 
 # Environments which for user settings when create applications
-W9_HTTP_PORT_SET=2342
-W9_DB_EXPOSE="mysql"
+W9_HTTP_PORT_SET=9001
+W9_HTTP_PORT=2342
+W9_LOGIN_USER=admin
+W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
+W9_URL=internet_ip
+W9_URL_REPLACE=true
+W9_URL_WITH_PORT=true
+W9_DB_EXPOSE="mariadb"
 W9_NETWORK=websoft9
 #### ------------------------------------------------------------------------------------ ####
 
-
 ##--------------- photoprism environments for user ---------------------------------------------- ##
-
-PHOTOPRISM_ADMIN_USER=admin                
-PHOTOPRISM_ADMIN_PASSWORD=$W9_POWER_PASSWORD
-
-PHOTOPRISM_DATABASE_DRIVER=$W9_DB_EXPOSE          
-PHOTOPRISM_DATABASE_SERVER=mariadb:3306     # MariaDB database server (hostname:port)
-PHOTOPRISM_DATABASE_NAME=photoprism         # MariaDB database schema name
-PHOTOPRISM_DATABASE_USER=photoprism         # MariaDB database user name
-PHOTOPRISM_DATABASE_PASSWORD=$W9_POWER_PASSWORD 
-
-MARIADB_DATABASE=photoprism
-MARIADB_USER=photoprism
-MARIADB_PASSWORD=$W9_POWER_PASSWORD  
-MARIADB_ROOT_PASSWORD=$W9_POWER_PASSWORD  
+PHOTOPRISM_ADMIN_USER=$W9_LOGIN_USER     # admin login username
+PHOTOPRISM_ADMIN_PASSWORD=$W9_POWER_PASSWORD    # initial admin password (8-72 characters)
+PHOTOPRISM_AUTH_MODE="password"   # authentication mode (public, password)
+PHOTOPRISM_SITE_URL="http://$W9_URL"  # server URL in the format "http(s)://domain.name(:port)/(path)"
+PHOTOPRISM_DISABLE_TLS="false"    # disables HTTPS/TLS even if the site URL starts with https:// and a certificate is available
+PHOTOPRISM_DEFAULT_TLS="true"     # defaults to a self-signed HTTPS/TLS certificate if no other certificate is available
+PHOTOPRISM_ORIGINALS_LIMIT=5000   # file size limit for originals in MB (increase for high-res video)
+PHOTOPRISM_HTTP_COMPRESSION="gzip"# improves transfer speed and bandwidth utilization (none or gzip)
+PHOTOPRISM_LOG_LEVEL="info" # log level=trace, debug, info, warning, error, fatal, or panic
+PHOTOPRISM_READONLY="false" # do not modify originals directory (reduced functionality)
+PHOTOPRISM_EXPERIMENTAL="false"   # enables experimental features
+PHOTOPRISM_DISABLE_CHOWN="false"  # disables updating storage permissions via chmod and chown on startup
+PHOTOPRISM_DISABLE_WEBDAV="false" # disables built-in WebDAV server
+PHOTOPRISM_DISABLE_SETTINGS="false"     # disables settings UI and API
+PHOTOPRISM_DISABLE_TENSORFLOW="false"   # disables all features depending on TensorFlow
+PHOTOPRISM_DISABLE_FACES="false"  # disables face detection and recognition (requires TensorFlow)
+PHOTOPRISM_DISABLE_CLASSIFICATION="false"     # disables image classification (requires TensorFlow)
+PHOTOPRISM_DISABLE_VECTORS="false"# disables vector graphics support
+PHOTOPRISM_DISABLE_RAW="false"    # disables indexing and conversion of RAW images
+PHOTOPRISM_RAW_PRESETS="false"    # enables applying user presets when converting RAW images (reduces performance)
+PHOTOPRISM_SIDECAR_YAML="true"    # creates YAML sidecar files to back up picture metadata
+PHOTOPRISM_BACKUP_ALBUMS="true"   # creates YAML files to back up album metadata
+PHOTOPRISM_BACKUP_DATABASE="true" # creates regular backups based on the configured schedule
+PHOTOPRISM_BACKUP_SCHEDULE="daily"# backup SCHEDULE in cron format (e.g. "0 12 * * *" for daily at noon) or at a random time (daily, weekly)
+PHOTOPRISM_INDEX_SCHEDULE=""# indexing SCHEDULE in cron format (e.g. "@every 3h" for every 3 hours; "" to disable)
+PHOTOPRISM_AUTO_INDEX=300   # delay before automatically indexing files in SECONDS when uploading via WebDAV (-1 to disable)
+PHOTOPRISM_AUTO_IMPORT=-1   # delay before automatically importing files in SECONDS when uploading via WebDAV (-1 to disable)
+PHOTOPRISM_DETECT_NSFW="false"    # automatically flags photos as private that MAY be offensive (requires TensorFlow)
+PHOTOPRISM_UPLOAD_NSFW="true"     # allows uploads that MAY be offensive (no effect without TensorFlow)
+# PHOTOPRISM_DATABASE_DRIVER="sqlite"   # SQLite is an embedded database that does not require a separate database server
+PHOTOPRISM_DATABASE_DRIVER="mysql"# MariaDB 10.5.12+ (MySQL successor) offers significantly better performance compared to SQLite
+PHOTOPRISM_DATABASE_SERVER="mariadb:3306"     # MariaDB database server (hostname:port)
+PHOTOPRISM_DATABASE_NAME="photoprism"   # MariaDB database schema name
+PHOTOPRISM_DATABASE_USER="photoprism"   # MariaDB database user name
+PHOTOPRISM_DATABASE_PASSWORD=$W9_POWER_PASSWORD # MariaDB database user password
+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 ffmpeg 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):
+# PHOTOPRISM_UID=1000
+# PHOTOPRISM_GID=1000
+# PHOTOPRISM_UMASK=0000
 
diff --git a/apps/photoprism/CHANGELOG.md b/apps/photoprism/CHANGELOG.md
@@ -1,5 +1,2 @@
 # CHANGELOG
 
-## Release
-### Fixes and Enhancements
-
diff --git a/apps/photoprism/Notes.md b/apps/photoprism/Notes.md
@@ -1,11 +1 @@
-## ZenTao
-
-- ZenTao 需要用户自助完成安装向导流程  
-- 18.8 以后无需 cmd.sh 修改密码配置
-
-## FAQ
-
-
-#### 如何修改 php 配置文件？
-
-目前没有环境变量方案，官方提供的路径： /etc/php/7.0/apache2
+## PhotoPrism
diff --git a/apps/photoprism/docker-compose.yml b/apps/photoprism/docker-compose.yml
@@ -15,48 +15,6 @@ services:
       - apparmor:unconfined
     ports:
       - $W9_HTTP_PORT_SET:2342
-    environment:
-      PHOTOPRISM_ADMIN_USER: $PHOTOPRISM_ADMIN_USER               # admin login username
-      PHOTOPRISM_ADMIN_PASSWORD: $PHOTOPRISM_ADMIN_PASSWORD        # initial admin password (8-72 characters)
-      PHOTOPRISM_AUTH_MODE: "password"               # authentication mode (public, password)
-      PHOTOPRISM_SITE_URL: "http://localhost:2342/"  # server URL in the format "http(s)://domain.name(:port)/(path)"
-
-      PHOTOPRISM_DISABLE_TLS: "false"                # disables HTTPS/TLS even if the site URL starts with https:// and a certificate is available
-      PHOTOPRISM_DEFAULT_TLS: "true"                 # defaults to a self-signed HTTPS/TLS certificate if no other certificate is available
-      PHOTOPRISM_ORIGINALS_LIMIT: 5000               # file size limit for originals in MB (increase for high-res video)
-      PHOTOPRISM_HTTP_COMPRESSION: "gzip"            # improves transfer speed and bandwidth utilization (none or gzip)
-      PHOTOPRISM_LOG_LEVEL: "info"                   # log level: trace, debug, info, warning, error, fatal, or panic
-      PHOTOPRISM_READONLY: "false"                   # do not modify originals directory (reduced functionality)
-      PHOTOPRISM_EXPERIMENTAL: "false"               # enables experimental features
-      PHOTOPRISM_DISABLE_CHOWN: "false"              # disables updating storage permissions via chmod and chown on startup
-      PHOTOPRISM_DISABLE_WEBDAV: "false"             # disables built-in WebDAV server
-      PHOTOPRISM_DISABLE_SETTINGS: "false"           # disables settings UI and API
-      PHOTOPRISM_DISABLE_TENSORFLOW: "false"         # disables all features depending on TensorFlow
-      PHOTOPRISM_DISABLE_FACES: "false"              # disables face detection and recognition (requires TensorFlow)
-      PHOTOPRISM_DISABLE_CLASSIFICATION: "false"     # disables image classification (requires TensorFlow)
-      PHOTOPRISM_DISABLE_VECTORS: "false"            # disables vector graphics support
-      PHOTOPRISM_DISABLE_RAW: "false"                # disables indexing and conversion of RAW images
-      PHOTOPRISM_RAW_PRESETS: "false"                # enables applying user presets when converting RAW images (reduces performance)
-      PHOTOPRISM_SIDECAR_YAML: "true"                # creates YAML sidecar files to back up picture metadata
-      PHOTOPRISM_BACKUP_ALBUMS: "true"               # creates YAML files to back up album metadata
-      PHOTOPRISM_BACKUP_DATABASE: "true"             # creates regular backups based on the configured schedule
-      PHOTOPRISM_BACKUP_SCHEDULE: "daily"            # backup SCHEDULE in cron format (e.g. "0 12 * * *" for daily at noon) or at a random time (daily, weekly)
-      PHOTOPRISM_INDEX_SCHEDULE: ""                  # indexing SCHEDULE in cron format (e.g. "@every 3h" for every 3 hours; "" to disable)
-      PHOTOPRISM_AUTO_INDEX: 300                     # delay before automatically indexing files in SECONDS when uploading via WebDAV (-1 to disable)
-      PHOTOPRISM_AUTO_IMPORT: -1                     # delay before automatically importing files in SECONDS when uploading via WebDAV (-1 to disable)
-      PHOTOPRISM_DETECT_NSFW: "false"                # automatically flags photos as private that MAY be offensive (requires TensorFlow)
-      PHOTOPRISM_UPLOAD_NSFW: "true"                 # allows uploads that MAY be offensive (no effect without TensorFlow)
-
-      PHOTOPRISM_DATABASE_DRIVER: $PHOTOPRISM_DATABASE_DRIVER           # MariaDB 10.5.12+ (MySQL successor) offers significantly better performance compared to SQLite
-      PHOTOPRISM_DATABASE_SERVER: $PHOTOPRISM_DATABASE_SERVER     # MariaDB database server (hostname:port)
-      PHOTOPRISM_DATABASE_NAME: $PHOTOPRISM_DATABASE_NAME        # MariaDB database schema name
-      PHOTOPRISM_DATABASE_USER: $PHOTOPRISM_DATABASE_USER       # MariaDB database user name
-      PHOTOPRISM_DATABASE_PASSWORD: $PHOTOPRISM_DATABASE_PASSWORD       # MariaDB database user password
-
-      PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App"
-      PHOTOPRISM_SITE_DESCRIPTION: ""                # meta site description
-      PHOTOPRISM_SITE_AUTHOR: ""                     # meta site author
-
     working_dir: "/photoprism" # do not change or remove
     volumes:
       # "/host/folder:/photoprism/folder"                # Example
@@ -65,7 +23,6 @@ services:
       # - "~/Import:/photoprism/import"                  # *Optional* base folder from which files can be imported to originals
       - photoprism-storage:/photoprism/storage                  # *Writable* storage folder for cache, database, and sidecar files (DO NOT REMOVE)
 
-
   mariadb:
     image: mariadb:11
     container_name: $W9_ID-mariadb
@@ -79,13 +36,11 @@ services:
       - mariadb_data:/var/lib/mysql # DO NOT REMOVE
     environment:
       MARIADB_AUTO_UPGRADE: "1"
-      MARIADB_INITDB_SKIP_TZINFO: "1"
-
-      MARIADB_DATABASE: $MARIADB_DATABASE
-      MARIADB_USER: $MARIADB_USER
-      MARIADB_PASSWORD: $MARIADB_PASSWORD 
-      MARIADB_ROOT_PASSWORD: $MARIADB_ROOT_PASSWORD
-
+      MARIADB_INITDB_SKIP_TZINFO: "1"    
+      MARIADB_DATABASE: photoprism
+      MARIADB_USER: photoprism
+      MARIADB_PASSWORD: $W9_POWER_PASSWORD 
+      MARIADB_ROOT_PASSWORD: $W9_POWER_PASSWORD
 
   watchtower:
     restart: unless-stopped
@@ -97,7 +52,7 @@ services:
       WATCHTOWER_POLL_INTERVAL: 7200 # checks for updates every two hours
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
-      - "~/.docker/config.json:/config.json" # optional, for authentication if you have a Docker Hub account
+      #- "~/.docker/config.json:/config.json" # optional, for authentication if you have a Docker Hub account
 
 networks:
   default:

diff --git a/apps/photoprism/variables.json b/apps/photoprism/variables.json
@@ -1,14 +1,13 @@
 {
   "name": "photoprism",
-  "trademark": "ZenTao",
-  "release": true,
-  "fork_url": "https://hub.docker.com/r/easysoft/zentao",
-  "docker_url": "https://hub.docker.com/r/easysoft/zentao/tags",
+  "trademark": "PhotoPrism",
+  "release": false,
+  "fork_url": "https://github.com/photoprism/photoprism",
+  "docker_url": "https://hub.docker.com/r/photoprism/photoprism/tags",
   "edition": [
     {
       "dist": "community",
       "version": [
-        "18.12",
         "latest"
       ]
     }
@@ -17,6 +16,6 @@
     "cpu": "1",
     "memory": "1",
     "disk": "1",
-    "url": "https://hub.docker.com/r/easysoft/zentao"
+    "url": "https://www.photoprism.app/"
   }
 }