From 86c22ecf9d3983107aa0e49f42a853d025f8a6ca Mon Sep 17 00:00:00 2001 From: akanealw Date: Fri, 24 Apr 2026 01:23:24 +0000 Subject: [PATCH] updated files --- !newcontainer/dummy-compose.yml | 8 ++++++++ dockhand/compose.yml | 2 +- docmost/compose.yml | 6 +++--- ebookapps/compose.yml | 18 +++++++++--------- filebrowser/compose.yml | 6 +++--- gitea/compose.yml | 2 +- karakeep/.env | 17 +++++++++++++++++ karakeep/compose.yml | 4 ++-- linkwarden/.env | 17 +++++++++++++++++ linkwarden/compose.yml | 4 ++-- nextcloud/compose.yml | 4 ++-- opengist/compose.yml | 4 ++-- wallos/compose.yml | 4 ++-- 13 files changed, 69 insertions(+), 27 deletions(-) diff --git a/!newcontainer/dummy-compose.yml b/!newcontainer/dummy-compose.yml index 1ad3ea8..03b94d0 100644 --- a/!newcontainer/dummy-compose.yml +++ b/!newcontainer/dummy-compose.yml @@ -10,3 +10,11 @@ networks: reverse-proxy: name: reverse-proxy external: true + +{$PUID} + +{$PGID} + +{$TZ} + +$PWD diff --git a/dockhand/compose.yml b/dockhand/compose.yml index f36fbd2..0a87c4d 100644 --- a/dockhand/compose.yml +++ b/dockhand/compose.yml @@ -7,4 +7,4 @@ services: - 3330:3000 volumes: - /var/run/docker.sock:/var/run/docker.sock - - ./dockhand_data:/app/data + - ${DOCKER_CONFIGS}/dockhand_data:/app/data diff --git a/docmost/compose.yml b/docmost/compose.yml index 233d5b4..ef268cb 100644 --- a/docmost/compose.yml +++ b/docmost/compose.yml @@ -17,7 +17,7 @@ services: - 3300:3000 restart: unless-stopped volumes: - - ./docmost:/app/data/storage + - ${DOCKER_CONFIGS}/docmost:/app/data/storage docmost-db: container_name: docmost-db @@ -30,7 +30,7 @@ services: - docmost restart: unless-stopped volumes: - - ./db_data:/var/lib/postgresql/data + - ${DOCKER_CONFIGS}/db_data:/var/lib/postgresql/data docmost-redis: container_name: docmost-redis @@ -39,7 +39,7 @@ services: - docmost restart: unless-stopped volumes: - - ./redis_data:/data + - ${DOCKER_CONFIGS}/redis_data:/data networks: docmost: diff --git a/ebookapps/compose.yml b/ebookapps/compose.yml index 916efa2..2ed5033 100644 --- a/ebookapps/compose.yml +++ b/ebookapps/compose.yml @@ -5,10 +5,10 @@ services: container_name: calibre-web-automated environment: # Only change these if you know what you're doing - - PUID=1000 - - PGID=1000 + - PUID={$PUID} + - PGID={$PGID} # Edit to match your current timezone https://en.wikipedia.org/wiki/List_of_tz_database_time_zones - - TZ=America/Chicago + - TZ={$TZ} # Hardcover API Key required for Hardcover as a Metadata Provider, get one here: https://docs.hardcover.app/api/getting-started/ - HARDCOVER_TOKEN=your_hardcover_api_key_here # If your library is on a network share (e.g., NFS/SMB), disable WAL to reduce locking issues @@ -19,14 +19,14 @@ services: - CWA_PORT_OVERRIDE=8083 volumes: # CW users migrating should stop their existing CW instance, make a copy of the config folder, and bind that here to carry over all of their user settings ect. - - ./config:/config + - ${DOCKER_CONFIGS}/config:/config # This is an ingest dir, NOT a library one. Anything added here will be automatically added to your library according to the settings you have configured in CWA Settings page. All files placed here are REMOVED AFTER PROCESSING - /mnt/media/downloads/books:/cwa-book-ingest # If you don't have an existing library, CWA will automatically create one at the bind provided here - - ./calibre-library:/calibre-library + - ${DOCKER_CONFIGS}/calibre-library:/calibre-library # If you use calibre plugins, you can bind your plugins folder here to have CWA attempt to add them to its workflow (WIP) # If you are starting with a fresh install, you also need to copy customize.py.json to the Calibre config volume above, in /path/to/config/folder/.config/calibre/customize.py.json, see the note below for more info - - ./calibre/plugins/folder:/config/.config/calibre/plugins + - ${DOCKER_CONFIGS}/calibre/plugins/folder:/config/.config/calibre/plugins ports: # Change the first number to change the port you want to access the Web UI, not the second - 8083:8083 @@ -39,14 +39,14 @@ services: image: ghcr.io/calibrain/shelfmark:latest container_name: shelfmark environment: - PUID: 1000 - PGID: 1000 + - PUID={$PUID} + - PGID={$PGID} ports: - 8084:8084 restart: unless-stopped volumes: - /mnt/media/downloads/books:/books # Default destination for book downloads - - ./config:/config # App configuration + - ${DOCKER_CONFIGS}/config:/config # App configuration # Required for torrent / usenet - path must match your download client's volume exactly # - /path/to/downloads:/path/to/downloads \ No newline at end of file diff --git a/filebrowser/compose.yml b/filebrowser/compose.yml index fec118c..d3f557c 100644 --- a/filebrowser/compose.yml +++ b/filebrowser/compose.yml @@ -3,11 +3,11 @@ services: image: gtstef/filebrowser:stable container_name: filebrowser environment: - - "FILEBROWSER_CONFIG=data/config.yaml" # using our config file at ./data/config.yaml + - "FILEBROWSER_CONFIG=data/config.yaml" # using our config file at ${DOCKER_CONFIGS}/data/config.yaml ports: - 8900:80 restart: unless-stopped volumes: - - ./data:/home/filebrowser/data - - ./files:/files + - ${DOCKER_CONFIGS}/data:/home/filebrowser/data + - ${DOCKER_CONFIGS}/files:/files - /mnt/storage:/storage diff --git a/gitea/compose.yml b/gitea/compose.yml index b917b38..57adf03 100644 --- a/gitea/compose.yml +++ b/gitea/compose.yml @@ -9,7 +9,7 @@ services: networks: - reverse-proxy volumes: - - ./gitea:/data + - ${DOCKER_CONFIGS}/gitea:/data - /etc/localtime:/etc/localtime:ro ports: - 3100:3000 diff --git a/karakeep/.env b/karakeep/.env index 9b5d9a0..0ab6d08 100644 --- a/karakeep/.env +++ b/karakeep/.env @@ -1,3 +1,20 @@ +#GLOBAL SETTINGS +COMPOSE_HTTP_TIMEOUT=120 +COMPOSE_IGNORE_ORPHANS=1 +DOCKER_CONFIGS=. +DOCKERGID=999 +DOCKERHOSTNAME=DockerServer +DOCKERLOGGING_MAXFILE=10 +DOCKERLOGGING_MAXSIZE=200k +PGID=1000 +PUID=1000 +UMASK=000 +TZ=America/Chicago +BACKUP_DIR=/mnt/backups +MEDIA_DIR=/mnt/media +STORAGE_DIR=/mnt/storage + + KARAKEEP_VERSION=0.31.0 NEXTAUTH_SECRET=jhPAsKhMnKCNABIJYh/Zq+nXJgkgMkONcZe28tgV4G4fdSRG MEILI_MASTER_KEY=X7qUbz9Da0cvaipU4HG2obvTXARQiz/Va+Ya7chzcBwgJCNO diff --git a/karakeep/compose.yml b/karakeep/compose.yml index 029d7a7..104eb55 100644 --- a/karakeep/compose.yml +++ b/karakeep/compose.yml @@ -7,7 +7,7 @@ services: # By default, the data is stored in a docker volume called "data". # If you want to mount a custom directory, change the volume mapping to: # - /path/to/your/directory:/data - - ./data:/data + - ${DOCKER_CONFIGS}/data:/data networks: - karakeep - reverse-proxy @@ -47,7 +47,7 @@ services: networks: - karakeep volumes: - - ./meilisearch:/meili_data + - ${DOCKER_CONFIGS}/meilisearch:/meili_data networks: karakeep: diff --git a/linkwarden/.env b/linkwarden/.env index d7fa892..a0a75e9 100644 --- a/linkwarden/.env +++ b/linkwarden/.env @@ -1,3 +1,20 @@ +#GLOBAL SETTINGS +COMPOSE_HTTP_TIMEOUT=120 +COMPOSE_IGNORE_ORPHANS=1 +DOCKER_CONFIGS=. +DOCKERGID=999 +DOCKERHOSTNAME=DockerServer +DOCKERLOGGING_MAXFILE=10 +DOCKERLOGGING_MAXSIZE=200k +PGID=1000 +PUID=1000 +UMASK=000 +TZ=America/Chicago +BACKUP_DIR=/mnt/backups +MEDIA_DIR=/mnt/media +STORAGE_DIR=/mnt/storage + + NEXTAUTH_URL=http://192.168.1.30:3232/api/v1/auth NEXTAUTH_SECRET=pheimoo9roozahghaithais4Ooxiexahrie4ieph diff --git a/linkwarden/compose.yml b/linkwarden/compose.yml index f9da9ff..2f7ca56 100644 --- a/linkwarden/compose.yml +++ b/linkwarden/compose.yml @@ -7,7 +7,7 @@ services: networks: - linkwarden volumes: - - ./pgdata:/var/lib/postgresql/data + - ${DOCKER_CONFIGS}/pgdata:/var/lib/postgresql/data linkwarden: image: ghcr.io/linkwarden/linkwarden:latest @@ -22,7 +22,7 @@ services: - linkwarden - reverse-proxy volumes: - - ./data:/data/data + - ${DOCKER_CONFIGS}/data:/data/data depends_on: - linkwarden-postgres diff --git a/nextcloud/compose.yml b/nextcloud/compose.yml index 3b458d1..df2ffe8 100644 --- a/nextcloud/compose.yml +++ b/nextcloud/compose.yml @@ -12,8 +12,8 @@ services: - 8443:443 restart: unless-stopped volumes: - - ./config:/config - - ./data:/data + - ${DOCKER_CONFIGS}/config:/config + - ${DOCKER_CONFIGS}/data:/data networks: reverse-proxy: diff --git a/opengist/compose.yml b/opengist/compose.yml index 7b502d1..adc8dde 100644 --- a/opengist/compose.yml +++ b/opengist/compose.yml @@ -8,8 +8,8 @@ services: ports: - 6157:6157 volumes: - - ./data:/opengist - - ./config.yml:/config.yml + - ${DOCKER_CONFIGS}/data:/opengist + - ${DOCKER_CONFIGS}/config.yml:/config.yml networks: reverse-proxy: diff --git a/wallos/compose.yml b/wallos/compose.yml index 5ee9fb5..566fb96 100644 --- a/wallos/compose.yml +++ b/wallos/compose.yml @@ -10,8 +10,8 @@ services: TZ: 'America/Chicago' restart: unless-stopped volumes: - - './db:/var/www/html/db' - - './logos:/var/www/html/images/uploads/logos' + - '${DOCKER_CONFIGS}/db:/var/www/html/db' + - '${DOCKER_CONFIGS}/logos:/var/www/html/images/uploads/logos' networks: reverse-proxy: