From c552abed0c92886fd4cc102227b010bba325668d Mon Sep 17 00:00:00 2001 From: thoralmighty Date: Mon, 24 Jul 2023 19:41:38 +0200 Subject: [PATCH 1/4] Updated Pi-Hole config for DHCP with admin panel port --- pihole/docker-compose.yml | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pihole/docker-compose.yml b/pihole/docker-compose.yml index 095d2aa..41471d8 100644 --- a/pihole/docker-compose.yml +++ b/pihole/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: "3.8" # More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/ services: @@ -6,12 +6,14 @@ services: container_name: pihole image: pihole/pihole:latest # For DHCP it is recommended to remove these ports and instead add: network_mode: "host" - ports: - - "53:53/tcp" - - "53:53/udp" - - "67:67/udp" # Only required if you are using Pi-hole as your DHCP server - - "8081:80/tcp" + network_mode: host + #ports: + #- "53:53/tcp" + #- "53:53/udp" + #- "67:67/udp" # Only required if you are using Pi-hole as your DHCP server + #- "8081:80/tcp" environment: + WEB_PORT: 8081 TZ: 'Europe/Stockholm' # WEBPASSWORD: 'set a secure password here or it will be random' # Volumes store your data between container upgrades @@ -19,14 +21,14 @@ services: - '/mnt/data/storage/pihole/etc-pihole:/etc/pihole' - '/mnt/data/storage/pihole/etc-dnsmasq.d:/etc/dnsmasq.d' # https://github.com/pi-hole/docker-pi-hole#note-on-capabilities - #cap_add: - # - NET_ADMIN # Required if you are using Pi-hole as your DHCP server, else not needed + cap_add: + - NET_ADMIN # Required if you are using Pi-hole as your DHCP server, else not needed restart: unless-stopped - networks: - - proxy +# networks: +# - proxy -networks: - default: - external: true - proxy: - external: true +#networks: +# default: +# external: true +# proxy: +# external: true From 0c538b0f1b39f776e748661b364b2fea77ff4c8b Mon Sep 17 00:00:00 2001 From: thoralmighty Date: Mon, 24 Jul 2023 19:44:57 +0200 Subject: [PATCH 2/4] Removed configurations not relevant to this branch --- minecraft/docker-compose.yml | 25 ------------------------- opentts-server/docker-compose.yml | 8 -------- 2 files changed, 33 deletions(-) delete mode 100644 minecraft/docker-compose.yml delete mode 100644 opentts-server/docker-compose.yml diff --git a/minecraft/docker-compose.yml b/minecraft/docker-compose.yml deleted file mode 100644 index 242428e..0000000 --- a/minecraft/docker-compose.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: '3.3' - -services: - minecraft-server: - volumes: - - serverdata:/data - environment: - - TYPE=FORGE - - MEMORY=4G - - VERSION=1.18.2 - - FORGE_VERSION=40.1.93 - - EULA=TRUE - - MOTD=Hej och välkommen! - ports: - - '25565:25565' - container_name: minecraft - image: itzg/minecraft-server - -volumes: - serverdata: - driver_opts: - type: "nfs" - o: "addr=192.168.1.100,nfsvers=4,retrans=6" - device: ":/mnt/data/storage/minecraft" - diff --git a/opentts-server/docker-compose.yml b/opentts-server/docker-compose.yml deleted file mode 100644 index 7357ff4..0000000 --- a/opentts-server/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: '3.3' -services: - opentts: - container_name: opentts - ports: - - '5500:5500' - image: 'synesthesiam/opentts:all' - command: --no-espeak --cache From 5d3b9e1dc2f492d65ec779b2b30f0fa06e387582 Mon Sep 17 00:00:00 2001 From: thoralmighty Date: Wed, 22 Nov 2023 19:11:54 +0100 Subject: [PATCH 3/4] Changed Jellyfin storage path --- jellyfin/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jellyfin/docker-compose.yml b/jellyfin/docker-compose.yml index 058c6e5..d772768 100644 --- a/jellyfin/docker-compose.yml +++ b/jellyfin/docker-compose.yml @@ -9,7 +9,7 @@ services: volumes: - /mnt/data/storage/jellyfin/config:/config - /mnt/data/storage/jellyfin/cache:/cache - - /mnt/hdd/Media:/media + - /mnt/data/media:/media #ports: # - "8096:8096/tcp" From 8378054c7c213cc65f677891955e6388389b5d56 Mon Sep 17 00:00:00 2001 From: thoralmighty Date: Wed, 22 Nov 2023 19:13:06 +0100 Subject: [PATCH 4/4] Added paperless-ngx and vaultwarden --- paperless-ngx/docker-compose.yml | 59 ++++++++++++++++++++++++++++++++ vaultwarden/docker-compose.yml | 14 ++++++++ 2 files changed, 73 insertions(+) create mode 100644 paperless-ngx/docker-compose.yml create mode 100644 vaultwarden/docker-compose.yml diff --git a/paperless-ngx/docker-compose.yml b/paperless-ngx/docker-compose.yml new file mode 100644 index 0000000..9f9e01f --- /dev/null +++ b/paperless-ngx/docker-compose.yml @@ -0,0 +1,59 @@ +# docker-compose file for running paperless from the Docker Hub. +# This file contains everything paperless needs to run. +# Paperless supports amd64, arm and arm64 hardware. +# +# All compose files of paperless configure paperless in the following way: +# +# - Paperless is (re)started on system boot, if it was running before shutdown. +# - Docker volumes for storing data are managed by Docker. +# - Folders for importing and exporting files are created in the same directory +# as this file and mounted to the correct folders inside the container. +# - Paperless listens on port 8000. +# +# SQLite is used as the database. The SQLite file is stored in the data volume. +# +# To install and update paperless with this file, do the following: +# +# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env' +# and '.env' into a folder. +# - Run 'docker-compose pull'. +# - Run 'docker-compose run --rm webserver createsuperuser' to create a user. +# - Run 'docker-compose up -d'. +# +# For more extensive installation and update instructions, refer to the +# documentation. + +version: "3.4" +services: + broker: + image: docker.io/library/redis:7 + restart: unless-stopped + volumes: + - redisdata:/data + + webserver: + image: ghcr.io/paperless-ngx/paperless-ngx:latest + restart: unless-stopped + depends_on: + - broker + ports: + - "8000:8000" + healthcheck: + test: ["CMD", "curl", "-fs", "-S", "--max-time", "2", "http://localhost:8000"] + interval: 30s + timeout: 10s + retries: 5 + volumes: + - data:/usr/src/paperless/data + - media:/usr/src/paperless/media + - ./export:/usr/src/paperless/export + - ./consume:/usr/src/paperless/consume + env_file: docker-compose.env + environment: + PAPERLESS_REDIS: redis://broker:6379 + + +volumes: + data: + media: + redisdata: diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml new file mode 100644 index 0000000..741582f --- /dev/null +++ b/vaultwarden/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.3' +services: + server: + container_name: vaultwarden + volumes: + - /mnt/data/storage/vaultwarden:/data + ports: + - '5080:80' + image: 'vaultwarden/server:latest' + networks: + - proxy +networks: + proxy: + external: true