Fix Unifi, Miniflux, Postfix after Update, Remove Photoprism (#708)
Reviewed-on: #708 Co-authored-by: Michael Grote <michael.grote@posteo.de> Co-committed-by: Michael Grote <michael.grote@posteo.de>
This commit is contained in:
parent
633889b5ca
commit
a02e2bfefe
5 changed files with 13 additions and 101 deletions
|
@ -6,9 +6,9 @@ services:
|
|||
image: "ghcr.io/miniflux/miniflux:2.0.51@sha256:9f3bca6a95428c04c8fb54ee723a5f69b9e419b0bf5dfd7a4d70dfb0414d60f1"
|
||||
restart: always
|
||||
depends_on:
|
||||
- db
|
||||
- mf-db16
|
||||
environment:
|
||||
DATABASE_URL: "postgres://miniflux:{{ lookup('keepass', 'miniflux_postgres_password', 'password') }}@mf-db/miniflux?sslmode=disable"
|
||||
DATABASE_URL: "postgres://miniflux:{{ lookup('keepass', 'miniflux_postgres_password', 'password') }}@mf-db16/miniflux?sslmode=disable"
|
||||
RUN_MIGRATIONS: 1
|
||||
# CREATE_ADMIN: 1
|
||||
# ADMIN_USERNAME: adminmf
|
||||
|
@ -30,20 +30,20 @@ services:
|
|||
traefik.http.services.miniflux.loadbalancer.server.port: 8080
|
||||
|
||||
com.centurylinklabs.watchtower.enable: true
|
||||
com.centurylinklabs.watchtower.depends-on: mf-db
|
||||
com.centurylinklabs.watchtower.depends-on: mf-db16
|
||||
|
||||
|
||||
######## PostGreSQL ########
|
||||
db:
|
||||
container_name: "mf-db"
|
||||
######## Postgres ########
|
||||
mf-db16:
|
||||
container_name: "mf-db16"
|
||||
image: "postgres:16.0@sha256:a80d0c1b119cf3d6bab27f72782f16e47ab8534ced937fa813ec2ab26e1fd81e"
|
||||
restart: always
|
||||
environment:
|
||||
POSTGRES_USER: miniflux
|
||||
POSTGRES_PASSWORD: "{{ lookup('keepass', 'miniflux_postgres_password', 'password') }}"
|
||||
TZ: Europe/Berlin
|
||||
POSTGRES_HOST_AUTH_METHOD: "md5" # Workaround beim Migration von 13 -> 16; https://eelkevdbos.medium.com/upgrade-postgresql-with-docker-compose-99d995e464 ;
|
||||
volumes:
|
||||
- db:/var/lib/postgresql/data
|
||||
- db16:/var/lib/postgresql/data
|
||||
networks:
|
||||
- intern
|
||||
labels:
|
||||
|
@ -72,7 +72,7 @@ services:
|
|||
|
||||
######## Volumes ########
|
||||
volumes:
|
||||
db:
|
||||
db16:
|
||||
######## Networks ########
|
||||
networks:
|
||||
traefik:
|
||||
|
|
|
@ -1,88 +0,0 @@
|
|||
version: '3.5'
|
||||
# ------------------------------------------------------------------
|
||||
# DOCKER COMPOSE COMMAND REFERENCE
|
||||
# ------------------------------------------------------------------
|
||||
# Start | docker-compose up -d
|
||||
# Stop | docker-compose stop
|
||||
# Update | docker-compose pull
|
||||
# Logs | docker-compose logs --tail=25 -f
|
||||
# Terminal | docker-compose exec photoprism bash
|
||||
# Help | docker-compose exec photoprism photoprism help
|
||||
# Config | docker-compose exec photoprism photoprism config
|
||||
# Reset | docker-compose exec photoprism photoprism reset
|
||||
# Backup | docker-compose exec photoprism photoprism backup -a -i
|
||||
# Restore | docker-compose exec photoprism photoprism restore -a -i
|
||||
# Index | docker-compose exec photoprism photoprism index
|
||||
# Reindex | docker-compose exec photoprism photoprism index -a
|
||||
# Import | docker-compose exec photoprism photoprism import
|
||||
# -------------------------------------------------------------------
|
||||
services:
|
||||
photoprism:
|
||||
# Use photoprism/photoprism:preview instead for testing preview builds:
|
||||
image: "photoprism/photoprism:231128@sha256:cf45026f3381b13cc638ed556d1f717340267d1a832794380f49998fd3a899c8"
|
||||
container_name: photoprism-frontend
|
||||
restart: always
|
||||
security_opt:
|
||||
- seccomp:unconfined
|
||||
- apparmor:unconfined
|
||||
ports:
|
||||
- 2342:2342
|
||||
environment:
|
||||
PHOTOPRISM_ADMIN_PASSWORD: "{{ lookup('keepass', 'photoprism_admin_password', 'password') }}"
|
||||
PHOTOPRISM_HTTP_PORT: 2342
|
||||
PHOTOPRISM_HTTP_COMPRESSION: "gzip" # none or gzip
|
||||
PHOTOPRISM_DEBUG: "false"
|
||||
PHOTOPRISM_PUBLIC: "false" # No authentication required (disables password protection)
|
||||
PHOTOPRISM_READONLY: "true" # Don't modify originals directory (reduced functionality)
|
||||
PHOTOPRISM_EXPERIMENTAL: "false"
|
||||
PHOTOPRISM_DISABLE_WEBDAV: "true"
|
||||
PHOTOPRISM_DISABLE_SETTINGS: "false"
|
||||
PHOTOPRISM_DISABLE_TENSORFLOW: "false"
|
||||
PHOTOPRISM_DARKTABLE_PRESETS: "false"
|
||||
PHOTOPRISM_DETECT_NSFW: "true"
|
||||
PHOTOPRISM_UPLOAD_NSFW: "true"
|
||||
PHOTOPRISM_DATABASE_DRIVER: "mysql"
|
||||
PHOTOPRISM_DATABASE_SERVER: "mariadb:3306"
|
||||
PHOTOPRISM_DATABASE_NAME: "photoprism"
|
||||
PHOTOPRISM_DATABASE_USER: "photoprism"
|
||||
PHOTOPRISM_DATABASE_PASSWORD: "{{ lookup('keepass', 'photoprism_database_password', 'password') }}"
|
||||
PHOTOPRISM_SITE_URL: "http://docker10.mgrote.net:2342/"
|
||||
PHOTOPRISM_SITE_TITLE: "PhotoPrism"
|
||||
PHOTOPRISM_SITE_CAPTION: "Browse Your Life"
|
||||
PHOTOPRISM_SITE_DESCRIPTION: ""
|
||||
PHOTOPRISM_SITE_AUTHOR: "mgrote"
|
||||
# You may optionally set a user / group id using environment variables if your Docker version or NAS does not
|
||||
# support this natively (see next example):
|
||||
UID: 5000
|
||||
GID: 5000
|
||||
# UMASK: 0000
|
||||
# Uncomment and edit the following line to set a specific user / group id (native):
|
||||
user: "5000:5000"
|
||||
volumes:
|
||||
- /mnt/fileserver3_photoprism_bilder_ro:/photoprism/originals/:ro
|
||||
- "storage:/photoprism/storage"
|
||||
labels:
|
||||
com.centurylinklabs.watchtower.enable: true
|
||||
com.centurylinklabs.watchtower.depends-on: photoprism-db
|
||||
|
||||
mariadb:
|
||||
image: "mariadb:11.2.2@sha256:eb6a2d34367b662a6e9c92e8cd112bbadf03ad4627f8eeb8d19f480f8da87fa6"
|
||||
container_name: photoprism-db
|
||||
restart: always
|
||||
security_opt:
|
||||
- seccomp:unconfined
|
||||
- apparmor:unconfined
|
||||
command: mysqld --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=50
|
||||
volumes: # Don't remove permanent storage for index database files!
|
||||
- "database:/var/lib/mysql"
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: "{{ lookup('keepass', 'photoprism_mysql_root_password', 'password') }}"
|
||||
MYSQL_DATABASE: photoprism
|
||||
MYSQL_USER: photoprism
|
||||
MYSQL_PASSWORD: "{{ lookup('keepass', 'photoprism_database_password', 'password') }}"
|
||||
labels:
|
||||
com.centurylinklabs.watchtower.enable: true
|
||||
|
||||
volumes:
|
||||
storage:
|
||||
database:
|
|
@ -37,8 +37,8 @@ services:
|
|||
|
||||
unifi-db:
|
||||
# Starte Container OHNE init-script
|
||||
# IN Container
|
||||
# 1. mongo
|
||||
# In Container
|
||||
# 1. mongosh
|
||||
# 2. db.getSiblingDB("unifidb").createUser({user: "unifiuser", pwd: "GEHEIM", roles: [{role: "dbOwner", db: "unifidb"}, {role: "dbOwner", db: "unifidb_stat"}]});
|
||||
# https://discourse.linuxserver.io/t/cant-connect-to-mongodb-for-unifi-network-application/8166
|
||||
image: "docker.io/mongo:7.0.5@sha256:192e2724093257a7db12db6cbafd92e3e5d51937f13846d49ea555cea85787ce"
|
||||
|
@ -46,6 +46,8 @@ services:
|
|||
volumes:
|
||||
- db-data:/data/db
|
||||
restart: always
|
||||
environment:
|
||||
MARIADB_AUTO_UPGRADE: "1"
|
||||
labels:
|
||||
com.centurylinklabs.watchtower.enable: true
|
||||
networks:
|
||||
|
|
|
@ -69,8 +69,6 @@ compose_files:
|
|||
- name: woodpecker
|
||||
state: present
|
||||
network: traefik
|
||||
- name: photoprism
|
||||
state: present
|
||||
- name: wiki
|
||||
state: present
|
||||
network: traefik
|
||||
|
|
BIN
keepass_db.kdbx
BIN
keepass_db.kdbx
Binary file not shown.
Loading…
Reference in a new issue