✨ apps + appdata

Makefile

@@ -75,10 +75,10 @@ media-logs: ## Show the logs for the media services (plex, sonarr, radarr, etc).
 
 .PHONY: config-acme
 config-acme: ## Initialize the acme.json file.
-	mkdir -p appdata/core/traefik/acme/
-	rm -f appdata/core/traefik/acme/acme.json
-	touch appdata/core/traefik/acme/acme.json
-	chmod 600 appdata/core/traefik/acme/acme.json
+	mkdir -p appdata/traefik/acme/
+	rm -f appdata/traefik/acme/acme.json
+	touch appdata/traefik/acme/acme.json
+	chmod 600 appdata/traefik/acme/acme.json
 
 ##@ Backup 🗂️
 

README.md

@@ -16,20 +16,22 @@
 ## What is homelab?
 
 **`homelab`** is a collection of services that can be deployed from your home server and accessed
-securely from anywhere in the world. This project deploys multiple "stacks" of services:
+securely from anywhere in the world. Ultimately everything is deployed into a single
+docker compose application. Each service belongs to a [docker compose profile] - and the
+`Makefile` contains everything you need to get started and manage your homelab.
 
--   **`core`**: The `core` stack is the base of this project, it includes a [traefik] reverse proxy
+-   **`core`**: The `core` profile is the base of this project, it includes a [traefik] reverse proxy
     and [OAuth] service that allows you to access all of your services via a single domain name
     securely behind HTTPS and protected with Google OAuth.
--   **`media`**: The `media` stack includes services like [Plex], [Sonarr], [Radarr], and
-    [Ombi] that allow you to request, download, organize, and stream media to your devices. This stack
+-   **`media`**: The `media` profile includes services like [Plex], [Sonarr], [Radarr], and
+    [Ombi] that allow you to request, download, organize, and stream media to your devices. This profile
     is perfect for those who want to have a media server in their homelab.
--   **`utilities`**: The `utilities` stack includes services like [Watchtower] and [Portainer] that
+-   **`utilities`**: The `utilities` profile includes services like [Watchtower] and [Portainer] that
     are designed to help you manage your homelab, monitor your services,
     and keep your containers up-to-date.
--   **`miscellaneous`**: The `miscellaneous` stack is disabled by default.
+-   **`miscellaneous`**: The `miscellaneous` profile is disabled by default.
     It includes services like [ChatGPT Next Web] and [LibreOffice Online]
-    that don't fit into the other stacks. These services are great for improving your
+    that don't fit into the other profiles. These services are great for improving your
     productivity and adding some fun to your homelab.
 
 ## How does it work?
@@ -39,46 +41,38 @@ project that allows you to deploy a variety of services to your homelab.
 
 At the root of this repository is a `docker-compose.yaml` file that defines
 the entire homelab project - it uses the `include` directive to pull in
-individual service docker compose files from the `stacks` directory.
-Ultimately a single docker compose stack is created that deploys everything.
+individual service docker compose files from the `apps` directory.
 
 ```text
 .
-├── docker-compose.yaml                         # Main Docker Compose File
-├── .env                                        # Environment Variables and Configuration
-├── Makefile                                    # Makefile for common tasks and docker compose wrappers
-├── secrets                                     # Secret Files
-│   ├── cloudflare_api_key.secret               # Cloudflare API Key
-│   └── google_oauth.secret                     # Google OAuth Credentials and Whitelist
-├── stacks
-│   ├── media
-│   │   ├── plex.yaml                           # Each individual service has its own docker compose file
-│   │   ├── radarr.yaml
-│   |   ├── ombi.yaml
-│   │   └── sonarr.yaml
-│   ├── core                                    # Traefik Reverse Proxy and OAuth
-│   │   ├── oauth                               # OAuth Service
-│   │   └── traefik                             # Traefik Reverse Proxy
-│   │       ├── docker-compose.yaml             # Traefik Docker Compose File (Traefik Only)
-│   │       └── rules                           # Traefik Middlewares and Rules
-│   │           ├── middlewares-chains.yml
-│   │           ├── middlewares.yml
-│   │           └── tls-opts.yml
-│   ├── miscellaneous                           # Non Media Center Services (pihole, chat-gpt-next-web, etc.)
-│   │    └── chat-gpt-next-web.yaml
-│   └── utilities                               # Utility Services
-│       └── watchtower.yaml
-└── appdata                                     # Application Data Persistent Volumes
-    ├── media
-    │   ├── plex                                # Each individual service has its own subdirectory
-    │   └── sonarr
-    ├── core
-    │   ├── oauth
-    │   └── traefik
-    ├── miscellaneous
-    │   └── chat-gpt-next-web
-    └── utilities
-        └── watchtower
+├── docker-compose.yaml                     # Main Docker Compose File
+├── .env                                    # Environment Variables and Configuration
+├── Makefile                                # Makefile for common tasks and docker compose wrappers
+├── secrets                                 # Secret Files
+│   ├── cloudflare_api_key.secret           # Cloudflare API Key
+│   └── google_oauth.secret                 # Google OAuth Credentials and Whitelist
+├── apps                                    # Individual Service Docker Compose Files
+│   ├── plex.yaml
+│   ├── radarr.yaml
+│   ├── ombi.yaml
+│   ├── sonarr.yaml
+│   ├── oauth.yaml
+│   ├── chat-gpt-next-web.yaml
+│   ├── watchtower.yaml
+│   └── traefik                             # Traefik Reverse Proxy
+│       ├── docker-compose.yaml             # Traefik Docker Compose File
+│       └── rules                           # Traefik Middlewares and Rules
+│           ├── middlewares-chains.yml
+│           ├── middlewares.yml
+│           └── tls-opts.yml
+└── appdata                                 # Application Data Persistent Volumes
+    ├── plex                                # Each individual service has its own subdirectory
+    ├── sonarr
+    ├── oauth
+    ├── traefik
+    ├── chat-gpt-next-web
+    ├── utilities
+    └── watchtower
 ```
 
 ### Configuration
@@ -105,3 +99,4 @@ getting started.
 [Watchtower]: https://github.com/containrrr/watchtower
 [LibreOffice Online]: https://www.libreoffice.org/
 [Portainer]: https://github.com/portainer/portainer
+[docker compose profile]: https://docs.docker.com/compose/profiles/

stacks/archive/nzbget.yaml → apps/archive/nzbget.yaml

@@ -8,7 +8,7 @@ services:
         image: lscr.io/linuxserver/nzbget:latest
         profiles: ["media", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/nzbget:/config
+            - ${DOCKER_DIRECTORY}/appdata/nzbget:/config
             - ${COMPLETED_DOWNLOADS}:/downloads/completed
         environment:
             PUID: ${PUID}

stacks/media/calibre-web.yaml → apps/calibre-web.yaml

@@ -9,9 +9,9 @@ services:
         image: lscr.io/linuxserver/calibre-web:latest
         profiles: ["media", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/calibre-web:/config
+            - ${DOCKER_DIRECTORY}/appdata/calibre-web:/config
             - ${BOOKS_DIR}:/books
-            - ${DOCKER_DIRECTORY}/appdata/media/calibre:/calibre-config
+            - ${DOCKER_DIRECTORY}/appdata/calibre:/calibre-config
         environment:
             PUID: ${PUID}
             PGID: ${PGID}

stacks/media/calibre.yaml → apps/calibre.yaml

@@ -9,7 +9,7 @@ services:
         image: lscr.io/linuxserver/calibre:latest
         profiles: ["media", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/calibre:/config
+            - ${DOCKER_DIRECTORY}/appdata/calibre:/config
             - ${BOOKS_DIR}:/books
             - ${COMPLETED_DOWNLOADS}:/downloads
         environment:

stacks/media/heimdall.yaml → apps/heimdall.yaml

@@ -8,7 +8,7 @@ services:
         image: lscr.io/linuxserver/heimdall:latest
         profiles: ["media", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/heimdall:/config
+            - ${DOCKER_DIRECTORY}/appdata/heimdall:/config
         environment:
             PUID: ${PUID}
             PGID: ${PGID}

stacks/miscellaneous/homeassistant/docker-compose.yaml → apps/homeassistant/docker-compose.yaml

@@ -4,8 +4,8 @@ services:
         image: homeassistant/home-assistant:stable
         profiles: ["miscellaneous", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/stacks/miscellaneous/homeassistant/configuration.yaml:/config/configuration.yaml
-            - ${DOCKER_DIRECTORY}/appdata/miscellaneous/homeassistant:/config
+            - ${DOCKER_DIRECTORY}/apps/homeassistant/configuration.yaml:/config/configuration.yaml
+            - ${DOCKER_DIRECTORY}/appdata/homeassistant:/config
         environment:
             PUID: ${PUID}
             PGID: ${PGID}

stacks/miscellaneous/libreoffice.yaml → apps/libreoffice.yaml

@@ -13,7 +13,7 @@ services:
             - PGID=${PGID}
             - TZ=${TZ}
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/miscellaneous/libreoffice:/config
+            - ${DOCKER_DIRECTORY}/appdata/libreoffice:/config
         security_opt:
             - no-new-privileges:true
         networks:

stacks/media/nzbhydra.yaml → apps/nzbhydra.yaml

@@ -8,7 +8,7 @@ services:
         image: lscr.io/linuxserver/nzbhydra2:latest
         profiles: ["media", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/nzbhydra:/config
+            - ${DOCKER_DIRECTORY}/appdata/nzbhydra:/config
             - ${COMPLETED_DOWNLOADS}:/downloads
         environment:
             PUID: ${PUID}

stacks/media/ombi.yaml → apps/ombi.yaml

@@ -12,7 +12,7 @@ services:
             PGID: ${PGID}
             TZ: ${TZ}
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/ombi:/config
+            - ${DOCKER_DIRECTORY}/appdata/ombi:/config
         security_opt:
             - no-new-privileges:true
         restart: ${UNIVERSAL_RESTART_POLICY:-unless-stopped}

stacks/utilities/pihole.yaml → apps/pihole.yaml

@@ -14,8 +14,8 @@ services:
             DNS2: 8.8.4.4
             VIRTUAL_HOST: ${PIHOLE_SUBDOMAIN:-pihole}.${DOMAIN_NAME}
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/utilities/pihole/pihole/:/etc/pihole/
-            - ${DOCKER_DIRECTORY}/appdata/utilities/pihole/dnsmasq.d/:/etc/dnsmasq.d/
+            - ${DOCKER_DIRECTORY}/appdata/pihole/pihole/:/etc/pihole/
+            - ${DOCKER_DIRECTORY}/appdata/pihole/dnsmasq.d/:/etc/dnsmasq.d/
         networks:
             traefik:
         ports:

stacks/media/plex.yaml → apps/plex.yaml

@@ -9,10 +9,9 @@ services:
         profiles: ["media", "all"]
         network_mode: host
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/plex:/config
+            - ${DOCKER_DIRECTORY}/appdata/plex:/config
             - ${TV_DIR}:/tv
             - ${MOVIE_DIR}:/movies
-            - ${DOCKER_DIRECTORY}/stacks/media/shared:/shared
             - ${PLEX_TRANSCODE_DIR:-/tmp}:/transcode
             - ${BOOKS_DIR}:/books
         devices:

stacks/utilities/portainer.yaml → apps/portainer.yaml

@@ -9,8 +9,7 @@ services:
         image: portainer/portainer-ce:latest
         profiles: ["utilities", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/utilities/portainer:/data
-            - ${DOCKER_DIRECTORY}/stacks/utilities/shared:/shared
+            - ${DOCKER_DIRECTORY}/appdata/portainer:/data
         command: -H tcp://socket-proxy:2375
         environment:
             TZ: ${TZ}

stacks/utilities/postgres.yaml → apps/postgres.yaml

@@ -18,7 +18,7 @@ services:
         networks:
             internal:
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/utilities/homelab-postgres:/var/lib/postgresql/data
+            - ${DOCKER_DIRECTORY}/appdata/homelab-postgres:/var/lib/postgresql/data
             - ${DOCKER_DIRECTORY}/scripts/create-databases.sh:/docker-entrypoint-initdb.d/create-databases.sh
         restart: always
         healthcheck:

stacks/media/prowlarr.yaml → apps/prowlarr.yaml

@@ -8,7 +8,7 @@ services:
         image: lscr.io/linuxserver/prowlarr:develop
         profiles: ["media", "arrs", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/prowlarr:/config
+            - ${DOCKER_DIRECTORY}/appdata/prowlarr:/config
         environment:
             PUID: ${PUID}
             PGID: ${PGID}

stacks/media/radarr.yaml → apps/radarr.yaml

@@ -8,10 +8,9 @@ services:
         image: lscr.io/linuxserver/radarr:latest
         profiles: ["media", "arrs", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/radarr:/config
+            - ${DOCKER_DIRECTORY}/appdata/radarr:/config
             - ${COMPLETED_DOWNLOADS}:/downloads
             - ${MOVIE_DIR}:/movies
-            - ${DOCKER_DIRECTORY}/stacks/media/shared:/shared
         environment:
             PUID: ${PUID}
             PGID: ${PGID}

stacks/media/readarr.yaml → apps/readarr.yaml

@@ -9,10 +9,10 @@ services:
         image: lscr.io/linuxserver/readarr:develop
         profiles: ["media", "arrs", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/readarr:/config
+            - ${DOCKER_DIRECTORY}/appdata/readarr:/config
             - ${COMPLETED_DOWNLOADS}:/downloads
             - ${BOOKS_DIR}:/books
-            - ${DOCKER_DIRECTORY}/appdata/media/calibre:/calibre
+            - ${DOCKER_DIRECTORY}/appdata/calibre:/calibre
         environment:
             PUID: ${PUID}
             PGID: ${PGID}

stacks/media/sabnzbd.yaml → apps/sabnzbd.yaml

@@ -8,7 +8,7 @@ services:
         image: lscr.io/linuxserver/sabnzbd:latest
         profiles: ["media", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/sabnzbd:/config
+            - ${DOCKER_DIRECTORY}/appdata/sabnzbd:/config
             - ${COMPLETED_DOWNLOADS}:/downloads
             - ${INCOMPLETE_DOWNLOADS}:/incomplete-downloads
         environment:

stacks/utilities/sftpgo.yaml → apps/sftpgo.yaml

@@ -13,8 +13,8 @@ services:
             - ${MOVIE_DIR}:/srv/sftpgo/data/juftin/movies
             - ${TV_DIR}:/srv/sftpgo/data/juftin/tv
             - ${BOOKS_DIR}:/srv/sftpgo/data/juftin/books
-            - ${DOCKER_DIRECTORY}/appdata/utilities/sftpgo/data/:/srv/sftpgo/data/juftin/upload
-            - ${DOCKER_DIRECTORY}/appdata/utilities/sftpgo/config/:/var/lib/sftpgo/
+            - ${DOCKER_DIRECTORY}/appdata/sftpgo/data/:/srv/sftpgo/data/juftin/upload
+            - ${DOCKER_DIRECTORY}/appdata/sftpgo/config/:/var/lib/sftpgo/
         environment:
             PUID: ${PUID}
             PGID: ${PGID}

stacks/media/sonarr.yaml → apps/sonarr.yaml

@@ -8,10 +8,9 @@ services:
         image: lscr.io/linuxserver/sonarr:latest
         profiles: ["media", "arrs", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/sonarr:/config
+            - ${DOCKER_DIRECTORY}/appdata/sonarr:/config
             - ${COMPLETED_DOWNLOADS}:/downloads
             - ${TV_DIR}:/tv
-            - ${DOCKER_DIRECTORY}/stacks/media/shared:/shared
         environment:
             PUID: ${PUID}
             PGID: ${PGID}

stacks/media/tautulli.yaml → apps/tautulli.yaml

@@ -9,9 +9,8 @@ services:
         image: lscr.io/linuxserver/tautulli:latest
         profiles: ["media", "all"]
         volumes:
-            - ${DOCKER_DIRECTORY}/appdata/media/tautulli:/config
-            - ${DOCKER_DIRECTORY}/appdata/media/plex/Library/Application Support/Plex Media Server/Logs:/logs:ro
-            - ${DOCKER_DIRECTORY}/stacks/media/shared:/shared
+            - ${DOCKER_DIRECTORY}/appdata/tautulli:/config
+            - ${DOCKER_DIRECTORY}/appdata/plex/Library/Application Support/Plex Media Server/Logs:/logs:ro
         environment:
             PUID: ${PUID}
             PGID: ${PGID}

stacks/core/traefik/docker-compose.yaml → apps/traefik/docker-compose.yaml

@@ -27,10 +27,10 @@ services:
             - source: cloudflare_api_key
               target: /run/secrets/cloudflare_api_key
         volumes:
-            - ${DOCKER_DIRECTORY}/stacks/core/traefik/rules:/rules
-            - ${DOCKER_DIRECTORY}/appdata/core/traefik/logs:/logs
-            - ${DOCKER_DIRECTORY}/appdata/core/traefik/traefik:/etc/traefik
-            - ${DOCKER_DIRECTORY}/appdata/core/traefik/acme/acme.json:/acme.json
+            - ${DOCKER_DIRECTORY}/apps/traefik/rules:/rules
+            - ${DOCKER_DIRECTORY}/appdata/traefik/logs:/logs
+            - ${DOCKER_DIRECTORY}/appdata/traefik/traefik:/etc/traefik
+            - ${DOCKER_DIRECTORY}/appdata/traefik/acme/acme.json:/acme.json
         networks:
             traefik:
             docker:

stacks/media/transmission.yaml → apps/transmission.yaml

@@ -9,10 +9,9 @@ services:
         profiles: ["media", "all"]
         volumes:
             - /etc/localtime:/etc/localtime:ro
-            - ${DOCKER_DIRECTORY}/appdata/media/transmission:/config/transmission-home
+            - ${DOCKER_DIRECTORY}/appdata/transmission:/config/transmission-home
             - ${COMPLETED_DOWNLOADS}:/downloads
             - ${INCOMPLETE_DOWNLOADS}:/data/incomplete
-            - ${DOCKER_DIRECTORY}/stacks/media/shared:/shared
         environment:
             PUID: ${PUID}
             PGID: ${PGID}