From 51f70eb15d2e5e2be7f80681be1cdc009fec8792 Mon Sep 17 00:00:00 2001 From: bart Date: Sun, 8 Dec 2024 17:37:09 -0600 Subject: [PATCH] use local db for forgejo --- docker-compose.yml | 58 ++++------------------------------------------ 1 file changed, 5 insertions(+), 53 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c7cf848..b053e15 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -113,25 +113,6 @@ services: ports: - '3000:3000' - '222:22' - depends_on: - - forgejodb - - forgejodb: - image: postgres:14 - container_name: forgejodb - restart: always - environment: - - POSTGRES_USER=forgejo - - POSTGRES_PASSWORD=forgejo - - POSTGRES_DB=forgejo - volumes: - - /data/docker/volumes/forgejodb:/var/lib/postgresql/data - labels: - - traefik.enable=true - - traefik.http.routers.nextcloud.entrypoints=web,websecure - - traefik.http.routers.nextcloud.rule=Host(`forgejo.akeley.tech`) - - traefik.http.routers.nextcloud.tls=true - - traefik.http.routers.nextcloud.tls.certresolver=myresolver miniflux: image: miniflux/miniflux:latest @@ -139,30 +120,24 @@ services: ports: - "8081:8080" depends_on: - minifluxdb: + pg_db: condition: service_healthy environment: - - DATABASE_URL=postgres://miniflux:99uskas0_l@minifluxdb/miniflux?sslmode=disable + - DATABASE_URL=postgres://miniflux:99uskas0_l@pg_db/miniflux?sslmode=disable - RUN_MIGRATIONS=1 - CREATE_ADMIN=1 - ADMIN_USERNAME=admin - ADMIN_PASSWORD=982#@2gGGHjf - labels: - - traefik.enable=true - - traefik.http.routers.nextcloud.entrypoints=web,websecure - - traefik.http.routers.nextcloud.rule=Host(`miniflux.akeley.tech`) - - traefik.http.routers.nextcloud.tls=true - - traefik.http.routers.nextcloud.tls.certresolver=myresolver - minifluxdb: + pg_db: image: postgres:17-alpine - container_name: minifluxdb + container_name: pg_db environment: - POSTGRES_USER=miniflux - POSTGRES_PASSWORD=99uskas0_l - POSTGRES_DB=miniflux volumes: - - /data/docker/volumes/minifluxdb:/var/lib/postgresql/data + - /data/docker/volumes/pg_db:/var/lib/postgresql/data healthcheck: test: ["CMD", "pg_isready", "-U", "miniflux"] interval: 10s @@ -200,26 +175,3 @@ services: # - 'traefik.http.middlewares.authelia.forwardAuth.authResponseHeaders=Remote-User,Remote-Groups,Remote-Email,Remote-Name' - # nextcloud: - # image: nextcloud/all-in-one:latest - # container_name: nextcloud-aio-mastercontainer - # init: true - # volumes: - # - /var/run/docker.sock:/var/run/docker.sock - # - nextcloud_aio_mastercontainer:/mnt/docker-aio-config - # - /data:/data:rw - # - /docs/documents:/documents:rw - # ports: - # - 8088:8080 - # environment: - # - APACHE_PORT=11000 - # - APACHE_IP_BINDING=127.0.0.1 - # - NEXTCLOUD_DATADIR=/data/nextcloud - # - AIO_DISABLE_BACKUP_SECTION=true - # - SKIP_DOMAIN_VALIDATION=true - # labels: - # - traefik.enable=true - # - traefik.http.routers.nextcloud.entrypoints=web,websecure - # - traefik.http.routers.nextcloud.rule=Host(`nextcloud.akeley.tech`) - # - traefik.http.routers.nextcloud.tls=true - # - traefik.http.routers.nextcloud.tls.certresolver=myresolver