From 53038c27a98f2f9eb7114d51a4a0d350971fb648 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@photoprism.app>
Date: Tue, 9 Nov 2021 17:11:14 +0100
Subject: [PATCH] Docker: Update developer docker-compose.yml files

---
 docker-compose.drone.yml            | 13 ++++++++++---
 docker-compose.postgres.yml         | 19 +++++++++++++++----
 docker-compose.proxy.yml            | 21 ---------------------
 docker-compose.yml                  | 11 ++++++++---
 docker/development/caddy/.gitignore |  2 --
 docker/development/caddy/Caddyfile  |  3 ---
 6 files changed, 33 insertions(+), 36 deletions(-)
 delete mode 100644 docker-compose.proxy.yml
 delete mode 100644 docker/development/caddy/.gitignore
 delete mode 100644 docker/development/caddy/Caddyfile

diff --git a/docker-compose.drone.yml b/docker-compose.drone.yml
index fbcd54779..b5e21f356 100644
--- a/docker-compose.drone.yml
+++ b/docker-compose.drone.yml
@@ -1,8 +1,9 @@
 version: '3.5'
 
-# Drone CI Test Environment
-
+## Integration Environment for Drone CI
 services:
+  ## App Dev Container
+  ## Docs: https://docs.photoprism.org/developer-guide/
   photoprism:
     build: .
     image: photoprism/photoprism:develop
@@ -141,6 +142,8 @@ services:
       DRONE_TAG:
       DRONE_TARGET_BRANCH:
 
+  ## MariaDB Database Server
+  ## Docs: https://mariadb.com/docs/reference/cs10.6/
   mariadb:
     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
@@ -154,5 +157,9 @@ services:
       MYSQL_PASSWORD: photoprism
       MYSQL_DATABASE: photoprism
 
+  ## Dummy WebDAV Server
   dummy-webdav:
-    image: photoprism/webdav:20211021
+    image: photoprism/dummy-webdav:20211109
+    environment:
+      WEBDAV_USERNAME: admin
+      WEBDAV_PASSWORD: photoprism
diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml
index 3b49fcdd0..623d9b79b 100644
--- a/docker-compose.postgres.yml
+++ b/docker-compose.postgres.yml
@@ -1,11 +1,16 @@
 version: '3.5'
 
-# For developers only! PostgreSQL is NOT supported yet as Gorm (the ORM library) needs to be
-# upgraded first. The current version does NOT support compatible general data types:
+# ATTENTION: PostgreSQL is NOT supported yet as Gorm (our ORM library) needs to be upgraded first.
+# The current Gorm version does NOT support compatible general data types:
 # https://github.com/photoprism/photoprism/issues/47
 
+## Development Environment with
+## - App Dev Container
+## - PostgreSQL Database Server
+## - and Dummy Services
 services:
-  ## App Server (required)
+  ## App Dev Container
+  ## Docs: https://docs.photoprism.org/developer-guide/
   photoprism:
     build: .
     image: photoprism/photoprism:develop
@@ -67,6 +72,8 @@ services:
       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
 
+  ## PostgreSQL Database Server
+  ## Docs: https://www.postgresql.org/docs/
   postgres:
     image: postgres:12-alpine
     ports:
@@ -76,8 +83,12 @@ services:
       POSTGRES_USER: photoprism
       POSTGRES_PASSWORD: photoprism
 
+  ## Dummy WebDAV Server
   dummy-webdav:
-    image: photoprism/webdav:20211021
+    image: photoprism/dummy-webdav:20211109
+    environment:
+      WEBDAV_USERNAME: admin
+      WEBDAV_PASSWORD: photoprism
 
 volumes:
   go-mod:
diff --git a/docker-compose.proxy.yml b/docker-compose.proxy.yml
deleted file mode 100644
index b60fb6501..000000000
--- a/docker-compose.proxy.yml
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 525cbaf99..850f23d10 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,11 @@
 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:
   ## App Server
   photoprism:
@@ -82,7 +86,8 @@ services:
       - ".:/go/src/github.com/photoprism/photoprism"
       - "go-mod:/go/pkg/mod"
 
-  ## Database Server
+  ## MariaDB Database Server
+  ## Docs: https://mariadb.com/docs/reference/cs10.6/
   mariadb:
     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
diff --git a/docker/development/caddy/.gitignore b/docker/development/caddy/.gitignore
deleted file mode 100644
index be870b428..000000000
--- a/docker/development/caddy/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.crt
-*.key
diff --git a/docker/development/caddy/Caddyfile b/docker/development/caddy/Caddyfile
deleted file mode 100644
index 8a9606f56..000000000
--- a/docker/development/caddy/Caddyfile
+++ /dev/null
@@ -1,3 +0,0 @@
-*, localhost {
-    reverse_proxy photoprism:2342
-}