kelin/EZ-Homelab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix critical deployment issues for Round 4

Browse Source 
- Add DOCKER_API_VERSION=1.44 to Watchtower (fixes crash loop)
- Add dockerproxy-network creation to deploy script (fixes dashboard deployment)
- Add explicit acme.json file creation with 600 permissions (fixes SSL cert acquisition)
- Fix setup script to correctly resolve user home directory when run with sudo

These fixes resolve all critical blockers discovered in Round 3 testing.
This commit is contained in:
kelin
2026-01-13 17:36:47 -05:00
parent a53effad10
commit f92424ed6d
3 changed files with 62 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
docker-compose/infrastructure/docker-compose.yml
View File

@@ -15,25 +15,23 @@ services:
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
- 5001:5001 # Optional: direct access - "5001:5001" # Optional: direct access
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- /opt/stacks:/opt/stacks # Dockge manages stacks in this directory - /opt/stacks:/opt/stacks # Dockge manages stacks in this directory
- /opt/dockge/data:/app/data - /opt/dockge/data:/app/data
environment: environment:
- DOCKGE_STACKS_DIR=/opt/stacks - DOCKGE_STACKS_DIR=/opt/stacks
- DOCKGE_ENABLE_CONSOLE=true
labels: labels:
- homelab.category=infrastructure - "homelab.category=infrastructure"
- homelab.description=Docker Compose stack manager (PRIMARY) - "homelab.description=Docker Compose stack manager (PRIMARY)"
- dockge.managed=true - "traefik.enable=true"
- dockge.url=https://dockge.${DOMAIN} - "traefik.http.routers.dockge.rule=Host(`dockge.${DOMAIN}`)"
- traefik.enable=true - "traefik.http.routers.dockge.entrypoints=websecure"
- traefik.http.routers.dockge.rule=Host(`dockge.${DOMAIN}`) - "traefik.http.routers.dockge.tls=true"
- traefik.http.routers.dockge.entrypoints=websecure - "traefik.http.routers.dockge.middlewares=authelia@docker"
- traefik.http.routers.dockge.tls=true - "traefik.http.services.dockge.loadbalancer.server.port=5001"
- traefik.http.routers.dockge.middlewares=authelia@docker
- traefik.http.services.dockge.loadbalancer.server.port=5001
# Pi-hole - Network-wide ad blocker and DNS server # Pi-hole - Network-wide ad blocker and DNS server
# Access at: https://pihole.${DOMAIN} # Access at: https://pihole.${DOMAIN}
pihole: pihole:
@@ -44,8 +42,8 @@ services:
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
- 53:53/tcp # DNS TCP - "53:53/tcp" # DNS TCP
- 53:53/udp # DNS UDP - "53:53/udp" # DNS UDP
volumes: volumes:
- /opt/stacks/pihole/etc-pihole:/etc/pihole - /opt/stacks/pihole/etc-pihole:/etc/pihole
- /opt/stacks/pihole/etc-dnsmasq.d:/etc/dnsmasq.d - /opt/stacks/pihole/etc-dnsmasq.d:/etc/dnsmasq.d
@@ -59,18 +57,19 @@ services:
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
labels: labels:
- homelab.category=infrastructure - "homelab.category=infrastructure"
- homelab.description=Network-wide ad blocking and DNS - dockge.managed=true - "homelab.description=Network-wide ad blocking and DNS"
- dockge.url=https://pihole.${DOMAIN} - traefik.enable=true - "traefik.enable=true"
- traefik.http.routers.pihole.rule=Host(`pihole.${DOMAIN}`) - "traefik.http.routers.pihole.rule=Host(`pihole.${DOMAIN}`)"
- traefik.http.routers.pihole.entrypoints=websecure - "traefik.http.routers.pihole.entrypoints=websecure"
- traefik.http.routers.pihole.tls=true - "traefik.http.routers.pihole.tls=true"
- traefik.http.routers.pihole.middlewares=authelia@docker - "traefik.http.routers.pihole.middlewares=authelia@docker"
- traefik.http.services.pihole.loadbalancer.server.port=80 - "traefik.http.services.pihole.loadbalancer.server.port=80"
# Watchtower - Automatic container updates # Watchtower - Automatic container updates
# Runs silently in background, no UI # Runs silently in background, no UI
watchtower: watchtower:
image: containrrr/watchtower:latest image: containrrr/watchtower:1.7.1
container_name: watchtower container_name: watchtower
restart: unless-stopped restart: unless-stopped
networks: networks:
@@ -85,8 +84,9 @@ services:
- WATCHTOWER_NOTIFICATION_URL=${WATCHTOWER_NOTIFICATION_URL} - WATCHTOWER_NOTIFICATION_URL=${WATCHTOWER_NOTIFICATION_URL}
- DOCKER_API_VERSION=1.44 - DOCKER_API_VERSION=1.44
labels: labels:
- homelab.category=infrastructure - "homelab.category=infrastructure"
- homelab.description=Automatic Docker container updates - "homelab.description=Automatic Docker container updates"
# Dozzle - Real-time Docker log viewer # Dozzle - Real-time Docker log viewer
# Access at: https://dozzle.${DOMAIN} # Access at: https://dozzle.${DOMAIN}
dozzle: dozzle:
@@ -103,16 +103,15 @@ services:
- DOZZLE_TAILSIZE=300 - DOZZLE_TAILSIZE=300
- DOZZLE_FILTER=status=running - DOZZLE_FILTER=status=running
labels: labels:
- homelab.category=infrastructure - "homelab.category=infrastructure"
- homelab.description=Real-time Docker log viewer - "homelab.description=Real-time Docker log viewer"
- dockge.managed=true - "traefik.enable=true"
- dockge.url=https://dozzle.${DOMAIN} - "traefik.http.routers.dozzle.rule=Host(`dozzle.${DOMAIN}`)"
- traefik.enable=true - "traefik.http.routers.dozzle.entrypoints=websecure"
- traefik.http.routers.dozzle.rule=Host(`dozzle.${DOMAIN}`) - "traefik.http.routers.dozzle.tls=true"
- traefik.http.routers.dozzle.entrypoints=websecure - "traefik.http.routers.dozzle.middlewares=authelia@docker"
- traefik.http.routers.dozzle.tls=true - "traefik.http.services.dozzle.loadbalancer.server.port=8080"
- traefik.http.routers.dozzle.middlewares=authelia@docker
- traefik.http.services.dozzle.loadbalancer.server.port=8080
# Docker Proxy - Socket proxy for security # Docker Proxy - Socket proxy for security
# Used by services that need Docker socket access # Used by services that need Docker socket access
dockerproxy: dockerproxy:
@@ -122,7 +121,7 @@ services:
networks: networks:
- dockerproxy-network - dockerproxy-network
ports: ports:
- 127.0.0.1:2375:2375 - "127.0.0.1:2375:2375"
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
environment: environment:
@@ -132,8 +131,9 @@ services:
- NETWORKS=1 - NETWORKS=1
- NODES=1 - NODES=1
labels: labels:
- homelab.category=infrastructure - "homelab.category=infrastructure"
- homelab.description=Docker socket proxy for security - "homelab.description=Docker socket proxy for security"
# Glances - System monitoring # Glances - System monitoring
# Access at: https://glances.${DOMAIN} # Access at: https://glances.${DOMAIN}
glances: glances:
@@ -150,20 +150,19 @@ services:
environment: environment:
- GLANCES_OPT=-w - GLANCES_OPT=-w
labels: labels:
- homelab.category=infrastructure - "homelab.category=infrastructure"
- homelab.description=System and Docker monitoring - "homelab.description=System and Docker monitoring"
- dockge.managed=true - "traefik.enable=true"
- dockge.url=https://glances.${DOMAIN} - "traefik.http.routers.glances.rule=Host(`glances.${DOMAIN}`)"
- traefik.enable=true - "traefik.http.routers.glances.entrypoints=websecure"
- traefik.http.routers.glances.rule=Host(`glances.${DOMAIN}`) - "traefik.http.routers.glances.tls=true"
- traefik.http.routers.glances.entrypoints=websecure - "traefik.http.routers.glances.middlewares=authelia@docker"
- traefik.http.routers.glances.tls=true - "traefik.http.services.glances.loadbalancer.server.port=61208"
- traefik.http.routers.glances.middlewares=authelia@docker
- traefik.http.services.glances.loadbalancer.server.port=61208
networks: networks:
homelab-network:
driver: bridge
dockerproxy-network:
driver: bridge
traefik-network: traefik-network:
external: true external: true
homelab-network:
external: true
dockerproxy-network:
external: true

7
scripts/deploy-homelab.sh
View File

@@ -101,6 +101,7 @@ echo ""
log_info "Step 2/5: Creating Docker networks..." log_info "Step 2/5: Creating Docker networks..."
docker network create homelab-network 2>/dev/null && log_success "Created homelab-network" || log_info "homelab-network already exists" docker network create homelab-network 2>/dev/null && log_success "Created homelab-network" || log_info "homelab-network already exists"
docker network create traefik-network 2>/dev/null && log_success "Created traefik-network" || log_info "traefik-network already exists" docker network create traefik-network 2>/dev/null && log_success "Created traefik-network" || log_info "traefik-network already exists"
docker network create dockerproxy-network 2>/dev/null && log_success "Created dockerproxy-network" || log_info "dockerproxy-network already exists"
docker network create media-network 2>/dev/null && log_success "Created media-network" || log_info "media-network already exists" docker network create media-network 2>/dev/null && log_success "Created media-network" || log_info "media-network already exists"
echo "" echo ""
@@ -118,6 +119,12 @@ cp -r "$REPO_DIR/config-templates/traefik" /opt/stacks/core/
cp -r "$REPO_DIR/config-templates/authelia" /opt/stacks/core/ cp -r "$REPO_DIR/config-templates/authelia" /opt/stacks/core/
cp "$REPO_DIR/.env" /opt/stacks/core/.env cp "$REPO_DIR/.env" /opt/stacks/core/.env
# Create acme.json as a file (not directory) with correct permissions
log_info "Creating acme.json for SSL certificates..."
touch /opt/stacks/core/traefik/acme.json
chmod 600 /opt/stacks/core/traefik/acme.json
log_success "acme.json created with correct permissions"
# Replace domain placeholder in authelia configuration # Replace domain placeholder in authelia configuration
log_info "Configuring Authelia for domain: $DOMAIN..." log_info "Configuring Authelia for domain: $DOMAIN..."
sed -i "s/your-domain.duckdns.org/${DOMAIN}/g" /opt/stacks/core/authelia/configuration.yml sed -i "s/your-domain.duckdns.org/${DOMAIN}/g" /opt/stacks/core/authelia/configuration.yml

3
scripts/setup-homelab.sh
View File

@@ -162,7 +162,8 @@ generate_secret() {
} }
# Check if .env file exists in the repo # Check if .env file exists in the repo
REPO_ENV_FILE="$HOME/AI-Homelab/.env" ACTUAL_USER_HOME=$(eval echo ~$ACTUAL_USER)
REPO_ENV_FILE="$ACTUAL_USER_HOME/AI-Homelab/.env"
if [ ! -f "$REPO_ENV_FILE" ]; then if [ ! -f "$REPO_ENV_FILE" ]; then
log_error ".env file not found at $REPO_ENV_FILE" log_error ".env file not found at $REPO_ENV_FILE"
log_info "Please create .env file from .env.example first" log_info "Please create .env file from .env.example first"