Docker: Update developer docker-compose.yml files

This commit is contained in:
Michael Mayer 2021-11-09 17:11:14 +01:00
parent 051251bafb
commit 53038c27a9
6 changed files with 33 additions and 36 deletions

View file

@ -1,8 +1,9 @@
version: '3.5' version: '3.5'
# Drone CI Test Environment ## Integration Environment for Drone CI
services: services:
## App Dev Container
## Docs: https://docs.photoprism.org/developer-guide/
photoprism: photoprism:
build: . build: .
image: photoprism/photoprism:develop image: photoprism/photoprism:develop
@ -141,6 +142,8 @@ services:
DRONE_TAG: DRONE_TAG:
DRONE_TARGET_BRANCH: DRONE_TARGET_BRANCH:
## MariaDB Database Server
## Docs: https://mariadb.com/docs/reference/cs10.6/
mariadb: mariadb:
image: mariadb:10.6 image: mariadb:10.6
command: mysqld --port=4001 --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 command: mysqld --port=4001 --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
@ -154,5 +157,9 @@ services:
MYSQL_PASSWORD: photoprism MYSQL_PASSWORD: photoprism
MYSQL_DATABASE: photoprism MYSQL_DATABASE: photoprism
## Dummy WebDAV Server
dummy-webdav: dummy-webdav:
image: photoprism/webdav:20211021 image: photoprism/dummy-webdav:20211109
environment:
WEBDAV_USERNAME: admin
WEBDAV_PASSWORD: photoprism

View file

@ -1,11 +1,16 @@
version: '3.5' version: '3.5'
# For developers only! PostgreSQL is NOT supported yet as Gorm (the ORM library) needs to be # ATTENTION: PostgreSQL is NOT supported yet as Gorm (our ORM library) needs to be upgraded first.
# upgraded first. The current version does NOT support compatible general data types: # The current Gorm version does NOT support compatible general data types:
# https://github.com/photoprism/photoprism/issues/47 # https://github.com/photoprism/photoprism/issues/47
## Development Environment with
## - App Dev Container
## - PostgreSQL Database Server
## - and Dummy Services
services: services:
## App Server (required) ## App Dev Container
## Docs: https://docs.photoprism.org/developer-guide/
photoprism: photoprism:
build: . build: .
image: photoprism/photoprism:develop image: photoprism/photoprism:develop
@ -67,6 +72,8 @@ services:
PHOTOPRISM_JPEG_QUALITY: 92 # Set to 95 for high-quality thumbnails (25-100) PHOTOPRISM_JPEG_QUALITY: 92 # Set to 95 for high-quality thumbnails (25-100)
TF_CPP_MIN_LOG_LEVEL: 0 # Show TensorFlow log messages for development TF_CPP_MIN_LOG_LEVEL: 0 # Show TensorFlow log messages for development
## PostgreSQL Database Server
## Docs: https://www.postgresql.org/docs/
postgres: postgres:
image: postgres:12-alpine image: postgres:12-alpine
ports: ports:
@ -76,8 +83,12 @@ services:
POSTGRES_USER: photoprism POSTGRES_USER: photoprism
POSTGRES_PASSWORD: photoprism POSTGRES_PASSWORD: photoprism
## Dummy WebDAV Server
dummy-webdav: dummy-webdav:
image: photoprism/webdav:20211021 image: photoprism/dummy-webdav:20211109
environment:
WEBDAV_USERNAME: admin
WEBDAV_PASSWORD: photoprism
volumes: volumes:
go-mod: go-mod:

View file

@ -1,21 +0,0 @@
version: '3.5'
# HTTP / HTTPS Reverse Proxy Servers (for developers only)
services:
## Caddy 2
caddy:
image: caddy:2
depends_on:
- photoprism
ports:
- "80:80" # HTTP port (host:container)
- "443:443" # HTTPS port (host:container)
volumes:
- ./docker/development/caddy:/data/caddy/pki/authorities/local
- ./docker/development/caddy/Caddyfile:/etc/caddy/Caddyfile
networks:
default:
external:
name: shared

View file

@ -1,7 +1,11 @@
version: '3.5' version: '3.5'
# Default environment with app server, database, and dummy services (for developers only) ## Development Environment with
## - HTTPS Reverse Proxy
## - App Dev Container
## - MariaDB Database Server
## - Keycloak OpenID Connect Provider
## - and Dummy Services
services: services:
## App Server ## App Server
photoprism: photoprism:
@ -82,7 +86,8 @@ services:
- ".:/go/src/github.com/photoprism/photoprism" - ".:/go/src/github.com/photoprism/photoprism"
- "go-mod:/go/pkg/mod" - "go-mod:/go/pkg/mod"
## Database Server ## MariaDB Database Server
## Docs: https://mariadb.com/docs/reference/cs10.6/
mariadb: mariadb:
image: mariadb:10.6 image: mariadb:10.6
command: mysqld --port=4001 --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 command: mysqld --port=4001 --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

View file

@ -1,2 +0,0 @@
*.crt
*.key

View file

@ -1,3 +0,0 @@
*, localhost {
reverse_proxy photoprism:2342
}