Merge pull request #29 from TeamPiped/caddy-nginx

Use nginx in caddy for caching.
This commit is contained in:
Kavin 2022-11-03 20:19:53 +00:00 committed by GitHub
commit 113e0da985
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 17 deletions

View file

@ -20,7 +20,7 @@ FRONTEND_HOSTNAME {
} }
BACKEND_HOSTNAME { BACKEND_HOSTNAME {
reverse_proxy varnish:80 reverse_proxy nginx:80
import global import global
} }

View file

@ -1,5 +0,0 @@
vcl 4.0;
backend default {
.host = "piped-backend:8080";
}

View file

@ -24,19 +24,15 @@ services:
depends_on: depends_on:
- postgres - postgres
container_name: piped-backend container_name: piped-backend
varnish: nginx:
image: varnish:7.0-alpine image: nginx:mainline-alpine
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./config/default.vcl:/etc/varnish/default.vcl:ro - ./config/nginx.conf:/etc/nginx/nginx.conf:ro
container_name: varnish - ./config/pipedapi.conf:/etc/nginx/conf.d/pipedapi.conf:ro
container_name: nginx
depends_on: depends_on:
- piped - piped
healthcheck:
test: ash -c "wget --no-verbose --tries=1 --spider 127.0.0.1:80/feed || (varnishreload && exit 1)"
interval: 10s
timeout: 10s
retries: 1
caddy: caddy:
image: caddy:2-alpine image: caddy:2-alpine
restart: unless-stopped restart: unless-stopped
@ -47,7 +43,7 @@ services:
volumes: volumes:
- ./config/Caddyfile:/etc/caddy/Caddyfile:ro - ./config/Caddyfile:/etc/caddy/Caddyfile:ro
- caddy_data:/data - caddy_data:/data
- piped-proxy:/var/run/piped-proxy - piped-proxy:/var/run/ytproxy
container_name: caddy container_name: caddy
postgres: postgres:
image: postgres:13-alpine image: postgres:13-alpine
@ -69,7 +65,7 @@ services:
- WATCHTOWER_CLEANUP=true - WATCHTOWER_CLEANUP=true
- WATCHTOWER_INCLUDE_RESTARTING=true - WATCHTOWER_INCLUDE_RESTARTING=true
container_name: watchtower container_name: watchtower
command: piped-frontend piped-backend piped-proxy varnish caddy postgres watchtower command: piped-frontend piped-backend piped-proxy nginx caddy postgres watchtower
volumes: volumes:
caddy_data: null caddy_data: null
piped-proxy: null piped-proxy: null