Skip to content

Config docker compose review #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
domi41 merged 3 commits into from
Jun 2, 2025
Merged

Config docker compose review #62

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea028d9
fix: change the mounted directory of the db volume
domi41 May 31, 2025
a20352c
docs: explain why we've move the volume to postgresql
domi41 Jun 1, 2025
6ee597e
refacto: move config around without changing anything
domi41 Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
restart: unless-stopped
hostname: ${DB_HOST:-mj_db}
healthcheck:
start_period: 15s
start_period: 20s
test: ["CMD", "pg_isready", "--user", "${DB_USER:-mj}"]
interval: 1m
timeout: 10s
Expand All @@ -23,7 +23,10 @@ services:
ports:
- ${DB_PORT:-5433}:5432
volumes:
- db:/var/lib/mysql
# Old mount point, before the infamous 2025-05 database wipe.
#- db:/var/lib/mysql
# Restoring the volume backup only worked when we mounted it here.
- db:/var/lib/postgresql/data

mj_api:
profiles:
Expand All @@ -45,11 +48,6 @@ services:
depends_on:
mj_db:
condition: service_healthy
volumes:
- .:/code
networks:
- lan
- traefik_network
environment:
POSTGRES_HOST: ${DB_HOST:-mj_db}
POSTGRES_USER: "${DB_USER:-mj}"
Expand All @@ -60,6 +58,11 @@ services:
SECRET: "${SECRET}"
ports:
- 8877:8877
volumes:
- .:/code
networks:
- lan
- traefik_network
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik_network"
Expand Down Expand Up @@ -124,11 +127,11 @@ services:
interval: 10m
timeout: 10s
retries: 3
volumes:
- imgpush:/images
networks:
- lan
- traefik_network
volumes:
- imgpush:/images
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik_network"
Expand All @@ -147,9 +150,6 @@ services:
depends_on:
mj_db:
condition: service_healthy
networks:
- lan
- traefik_network
environment:
MB_DB_TYPE: postgres
MB_DB_DBNAME: "${DB_NAME:-mj}"
Expand All @@ -158,6 +158,9 @@ services:
MB_DB_USER: "${DB_USER:-mj}"
MB_DB_PASS: "${DB_PASS}"
TZ: ${TIMEZONE:-Europe/Paris}
networks:
- lan
- traefik_network
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik_network"
Expand Down Expand Up @@ -214,4 +217,4 @@ volumes:
networks:
lan:
traefik_network:
external: true
external: true