updated files

2026-04-24 01:23:24 +00:00
parent 2499d9cf4f
commit 86c22ecf9d
13 changed files with 69 additions and 27 deletions
@@ -10,3 +10,11 @@ networks:
  reverse-proxy:
    name: reverse-proxy
    external: true
+
+{$PUID}
+
+{$PGID}
+
+{$TZ}
+
+$PWD
@@ -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
@@ -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:
@@ -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
      
@@ -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
@@ -9,7 +9,7 @@ services:
    networks:
      - reverse-proxy
    volumes:
-      - ./gitea:/data
+      - ${DOCKER_CONFIGS}/gitea:/data
      - /etc/localtime:/etc/localtime:ro
    ports:
      - 3100:3000
@@ -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
@@ -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:
@@ -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

@@ -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

@@ -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:
@@ -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:
@@ -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: