Skip to content

Commit

Permalink
Merge pull request #1104 from Websoft9/update-photoprism-9c142aa2
Browse files Browse the repository at this point in the history
Update photoprism
  • Loading branch information
qiaofeng1227 authored Dec 27, 2024
2 parents 485ad33 + d34419c commit 1c85eaf
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 62 deletions.
54 changes: 9 additions & 45 deletions apps/photoprism/.env
Original file line number Diff line number Diff line change
@@ -1,70 +1,34 @@
W9_REPO=photoprism/photoprism
W9_DIST=community
W9_VERSION=latest
W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
W9_DIST='community'
W9_VERSION='latest'
W9_POWER_PASSWORD='K6gzwQHZ#U0eSzh!'

#### -- Not allowed to edit below environments when recreate app based on existing data -- ####
W9_ID=photoprism
W9_ID='photoprism'

# Environments which for user settings when create applications
W9_HTTP_PORT_SET=9001
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='internet_ip'
W9_URL_REPLACE=true
W9_URL_WITH_PORT=true
W9_DB_EXPOSE="mariadb"
W9_NETWORK=websoft9
#### ------------------------------------------------------------------------------------ ####

##--------------- photoprism environments for user ---------------------------------------------- ##
## more environments refer to: https://docs.photoprism.app/getting-started/config-options/
## more environments refer to: https://dl.photoprism.app/docker/compose.yaml

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

12 changes: 11 additions & 1 deletion apps/photoprism/Notes.md
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
## PhotoPrism
## PhotoPrism

## Config

- Users: Only Plus edition provider [GUI to manage users](https://docs.photoprism.app/user-guide/users/), open source edition need to manage users by [cli](https://docs.photoprism.app/user-guide/users/cli/)
- Mulitply languages, includes Chinese: **Settings > GENERAL**
- Mobile: false

## Use SQLite or MariaDB?

refer to: https://docs.photoprism.app/getting-started/faq/#should-i-use-sqlite-mariadb-or-mysql
15 changes: 1 addition & 14 deletions apps/photoprism/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# image: https://hub.docker.com/r/photoprism/photoprism
# docs: https://docs.photoprism.app/getting-started/docker-compose

version: '3.8'

services:
photoprism:
image: $W9_REPO:$W9_VERSION
Expand All @@ -25,7 +23,7 @@ services:
- photoprism-storage:/photoprism/storage # *Writable* storage folder for cache, database, and sidecar files (DO NOT REMOVE)

mariadb:
image: mariadb:10.6
image: mariadb:11
container_name: $W9_ID-mariadb
restart: unless-stopped
stop_grace_period: 5s
Expand All @@ -43,17 +41,6 @@ services:
MARIADB_PASSWORD: $W9_POWER_PASSWORD
MARIADB_ROOT_PASSWORD: $W9_POWER_PASSWORD

watchtower:
restart: unless-stopped
image: containrrr/watchtower
container_name: $W9_ID-watchtower
profiles: ["update"]
environment:
WATCHTOWER_CLEANUP: "true"
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

networks:
default:
Expand Down
4 changes: 2 additions & 2 deletions apps/photoprism/variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"requirements": {
"cpu": "1",
"memory": "1",
"disk": "1",
"url": "https://www.photoprism.app/"
"disk": "10",
"url": "https://docs.photoprism.app/getting-started/#system-requirements"
}
}

0 comments on commit 1c85eaf

Please sign in to comment.