infra: migrate to shared Caddy, remove Tailscale sidecar
This commit is contained in:
parent
b052ccf82c
commit
f03aa9e318
1 changed files with 8 additions and 25 deletions
|
|
@ -6,7 +6,7 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/data
|
- ./data:/data
|
||||||
networks:
|
networks:
|
||||||
- startpage-net
|
- startpage-internal
|
||||||
|
|
||||||
startpage-nginx:
|
startpage-nginx:
|
||||||
image: nginx:alpine
|
image: nginx:alpine
|
||||||
|
|
@ -19,30 +19,13 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
- startpage-app
|
- startpage-app
|
||||||
networks:
|
networks:
|
||||||
- startpage-net
|
- startpage-internal
|
||||||
- ts-startpage-net
|
- caddy-startpage-net
|
||||||
|
|
||||||
startpage-ts:
|
|
||||||
image: tailscale/tailscale:latest
|
|
||||||
container_name: startpage-ts
|
|
||||||
hostname: vps-startpage-01
|
|
||||||
environment:
|
|
||||||
- TS_AUTHKEY=${TS_AUTHKEY}
|
|
||||||
- TS_SERVE_CONFIG=/config/serve.json
|
|
||||||
- TS_STATE_DIR=/var/lib/tailscale
|
|
||||||
volumes:
|
|
||||||
- ./tailscale/state:/var/lib/tailscale
|
|
||||||
- ./tailscale/serve.json:/config/serve.json:ro
|
|
||||||
- /dev/net/tun:/dev/net/tun
|
|
||||||
cap_add:
|
|
||||||
- NET_ADMIN
|
|
||||||
- SYS_MODULE
|
|
||||||
restart: unless-stopped
|
|
||||||
networks:
|
|
||||||
- ts-startpage-net
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
startpage-net:
|
startpage-internal:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
ts-startpage-net:
|
internal: true
|
||||||
driver: bridge
|
caddy-startpage-net:
|
||||||
|
external: true
|
||||||
|
name: caddy_caddy-startpage-net
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue