From 2e4028d62370f241a4e95adcead418a58f979578 Mon Sep 17 00:00:00 2001 From: Ryan Prather Date: Thu, 26 Mar 2026 19:58:21 -0400 Subject: [PATCH] upd: docker-compose Add logging notation --- docker/compose.mariadb.yml | 16 ++++++++++++++-- docker/compose.mysql.yml | 16 ++++++++++++++-- docker/compose.pgsql.yml | 14 +++++++++++++- docker/compose.shared-db.yml | 11 ++++++++++- docker/compose.sqlite.yml | 11 ++++++++++- 5 files changed, 61 insertions(+), 7 deletions(-) diff --git a/docker/compose.mariadb.yml b/docker/compose.mariadb.yml index 069f651..a3ddc43 100644 --- a/docker/compose.mariadb.yml +++ b/docker/compose.mariadb.yml @@ -1,22 +1,34 @@ services: sermon-notes: - image: gitea.rkprather.com/ryan/sermon-notes:latest + image: gitea.rkprather.com/ryan/sermon-notes:1.3 container_name: sermon-notes hostname: sermon-notes restart: unless-stopped + env_file: .env + ports: - ${HTTP_PORT}:80 + volumes: - ${PWD}/.env:/var/www/html/.env + + logging: + driver: "json-file" + options: + max-size: "10m" + max-file: "3" + depends_on: - db db: - image: mariadb + image: mariadb:12.3 container_name: db hostname: db restart: unless-stopped + env_file: .env + volumes: - ${PWD}/db_data:/var/lib/mysql diff --git a/docker/compose.mysql.yml b/docker/compose.mysql.yml index afed044..efad69f 100644 --- a/docker/compose.mysql.yml +++ b/docker/compose.mysql.yml @@ -1,22 +1,34 @@ services: sermon-notes: - image: gitea.rkprather.com/ryan/sermon-notes:latest + image: gitea.rkprather.com/ryan/sermon-notes:1.3 container_name: sermon-notes hostname: sermon-notes restart: unless-stopped + env_file: .env + ports: - ${HTTP_PORT}:80 + volumes: - ${PWD}/.env:/var/www/html/.env + + logging: + driver: "json-file" + options: + max-size: "10m" + max-file: "3" + depends_on: - db db: - image: mysql + image: mysql:9.6 container_name: db hostname: db restart: unless-stopped + env_file: .env + volumes: - ${PWD}/db-data:/var/lib/mysql diff --git a/docker/compose.pgsql.yml b/docker/compose.pgsql.yml index 9b4b69b..3cbb007 100644 --- a/docker/compose.pgsql.yml +++ b/docker/compose.pgsql.yml @@ -1,14 +1,24 @@ services: sermon-notes: container_name: sermon-notes - image: gitea.rkprather.com/ryan/sermon-notes:latest + image: gitea.rkprather.com/ryan/sermon-notes:1.3 hostname: sermon-notes restart: unless-stopped + env_file: .env + ports: - ${HTTP_PORT}:80 + volumes: - ${PWD}/.env:/var/www/html/.env + + logging: + driver: "json-file" + options: + max-size: "10m" + max-file: "3" + depends_on: - db @@ -17,7 +27,9 @@ services: container_name: db hostname: db restart: unless-stopped + env_file: .env + volumes: - ${PWD}/db-data:/var/lib/postgresql/data \ No newline at end of file diff --git a/docker/compose.shared-db.yml b/docker/compose.shared-db.yml index a9c88c2..6afad59 100644 --- a/docker/compose.shared-db.yml +++ b/docker/compose.shared-db.yml @@ -1,11 +1,20 @@ services: sermon-notes: - image: gitea.rkprather.com/ryan/sermon-notes:latest + image: gitea.rkprather.com/ryan/sermon-notes:1.3 container_name: sermon-notes hostname: sermon-notes restart: unless-stopped + env_file: .env + ports: - ${HTTP_PORT}:80 + volumes: - ${PWD}/.env:/var/www/html/.env + + logging: + driver: "json-file" + options: + max-size: "10m" + max-file: "3" diff --git a/docker/compose.sqlite.yml b/docker/compose.sqlite.yml index bbcfb8a..f3c970f 100644 --- a/docker/compose.sqlite.yml +++ b/docker/compose.sqlite.yml @@ -1,12 +1,21 @@ services: sermon-notes: - image: gitea.rkprather.com/ryan/sermon-notes:latest + image: gitea.rkprather.com/ryan/sermon-notes:1.3 container_name: sermon-notes hostname: sermon-notes restart: unless-stopped + env_file: .env + ports: - ${HTTP_PORT}:80 + volumes: - ${PWD}/data:/data - ${PWD}/.env:/var/www/html/.env + + logging: + driver: "json-file" + options: + max-size: "10m" + max-file: "3" \ No newline at end of file