chris/docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add TLS resolvers to allow acme challenges to resolve

Browse Source 
Configure non-docker apps to proxy to host.docker.internal
Configure triliumnext-notes to use port 8080
Add host.docker.internal to caddy docker-compose
Explicitly specify .env file for caddy container
Remove port expose for triliumnext-notes container
This commit is contained in:
Chris King
2025-01-13 10:59:43 -08:00
parent 936242e24d
commit a671b15a96
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
caddy/Caddyfile
View File

@@ -23,6 +23,7 @@
zone_token {env.CF_ZONE_TOKEN} zone_token {env.CF_ZONE_TOKEN}
api_token {env.CF_API_TOKEN} api_token {env.CF_API_TOKEN}
} }
resolvers 1.1.1.1 1.0.0.1
} }
} }
(secure) { (secure) {
@@ -62,7 +63,7 @@
import ttt-log {args[0]} import ttt-log {args[0]}
import tls import tls
import secure * import secure *
import ttt-proxy 192.168.1.234 {args[1]} import ttt-proxy host.docker.internal {args[1]}
} }
} }
(ttt-app-alt) { (ttt-app-alt) {
@@ -108,7 +109,7 @@ import ttt-app homepage 3001
# Alternate configuration (different subdomain and docker compose project name) # Alternate configuration (different subdomain and docker compose project name)
import ttt-app-alt budget actual-server-app-1 5006 import ttt-app-alt budget actual-server-app-1 5006
import ttt-app-alt trilium triliumnext-notes-app-1 8040 import ttt-app-alt trilium triliumnext-notes-app-1 8080
import ttt-app-alt notes triliumnext-notes-app-1 8040 import ttt-app-alt notes triliumnext-notes-app-1 8080
import ttt-app-alt stash stashapp-app-1 9999 import ttt-app-alt stash stashapp-app-1 9999
import ttt-app-alt pihole1 192.168.1.116 80 import ttt-app-alt pihole1 192.168.1.116 80

5
caddy/docker-compose.yml
View File

@@ -3,8 +3,11 @@ services:
app: app:
build: . build: .
restart: unless-stopped restart: unless-stopped
env_file: .env
networks: networks:
- proxy-net - proxy-net
extra_hosts:
- "host.docker.internal:host-gateway"
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@@ -29,4 +32,4 @@ configs:
volumes: volumes:
caddy_data: caddy_data:
caddy_config: caddy_config:

2
triliumnext-notes/docker-compose.yml
View File

@@ -8,8 +8,6 @@ services:
- ./config:/home/node/trilium-config - ./config:/home/node/trilium-config
networks: networks:
- proxy-net - proxy-net
ports:
- "127.0.0.1:8040:8080"
environment: environment:
USER_UID: 1000 USER_UID: 1000
USER_GID: 1000 USER_GID: 1000