Merge pull request #718 from shi82421/dev

Add photoprism changes

apps/photoprism/.env

@@ -0,0 +1,31 @@
+W9_REPO=photoprism/photoprism
+W9_DIST=community
+W9_VERSION=latest
+W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
+
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID=photoprism
+
+# Environments which for user settings when create applications
+W9_HTTP_PORT_SET=2342
+W9_DB_EXPOSE="mysql"
+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  
+

apps/photoprism/CHANGELOG.md

@@ -0,0 +1,5 @@
+# CHANGELOG
+
+## Release
+### Fixes and Enhancements
+

apps/photoprism/Notes.md

@@ -0,0 +1,11 @@
+## ZenTao
+
+- ZenTao 需要用户自助完成安装向导流程  
+- 18.8 以后无需 cmd.sh 修改密码配置
+
+## FAQ
+
+
+#### 如何修改 php 配置文件？
+
+目前没有环境变量方案，官方提供的路径： /etc/php/7.0/apache2

apps/photoprism/README.md

@@ -0,0 +1,26 @@
+# ZenTao on Docker  
+
+This is an **Docker Compose solution** powered by [Websoft9](https://www.websoft9.com) based on Docker for ZenTao:
+
+
+ - community:  18.12, latest
+
+
+## System Requirements
+
+The following are the minimal [recommended requirements](https://hub.docker.com/r/easysoft/zentao):
+
+* **RAM**: 1 GB or more
+* **CPU**: 1 cores or higher
+* **Disk**: at least 1 GB of free space
+* **bandwidth**: more fluent experience over 100M  
+
+## Install
+
+You can install this ZenTao by [How to use it?](https://github.com/Websoft9/docker-library#how-to-use-it).   
+
+If you want use ZenTao with **Websoft9 Business Support** free, you can [subscribe ZenTao](https://www.websoft9.com/apps) on Cloud platform
+
+## Documentation
+
+[ZenTao Administrator Guide](https://support.websoft9.com/docs/zentao) powered by Websoft9

apps/photoprism/docker-compose.yml

@@ -0,0 +1,110 @@
+# 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
+    container_name: $W9_ID
+    stop_grace_period: 10s
+    depends_on:
+      - mariadb
+    security_opt:
+      - seccomp:unconfined
+      - 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
+      - photoprism-picture:/photoprism/originals             # Original media files (DO NOT REMOVE)
+      # - "/example/family:/photoprism/originals/family" # *Additional* media folders can be mounted like this
+      # - "~/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
+    restart: unless-stopped
+    stop_grace_period: 5s
+    security_opt: 
+      - seccomp:unconfined
+      - apparmor:unconfined
+    command: --innodb-buffer-pool-size=512M --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120
+    volumes:
+      - 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
+
+
+  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:
+    name: $W9_NETWORK
+    external: true
+
+volumes:
+  photoprism-picture:
+  photoprism-storage:
+  mariadb_data:

apps/photoprism/src/README.md

@@ -0,0 +1,3 @@
+# About
+
+This folder includes files mount to container and used by Websoft9

apps/photoprism/variables.json

@@ -0,0 +1,22 @@
+{
+  "name": "zentao",
+  "trademark": "ZenTao",
+  "release": true,
+  "fork_url": "https://hub.docker.com/r/easysoft/zentao",
+  "docker_url": "https://hub.docker.com/r/easysoft/zentao/tags",
+  "edition": [
+    {
+      "dist": "community",
+      "version": [
+        "18.12",
+        "latest"
+      ]
+    }
+  ],
+  "requirements": {
+    "cpu": "1",
+    "memory": "1",
+    "disk": "1",
+    "url": "https://hub.docker.com/r/easysoft/zentao"
+  }
+}