diff --git a/template/Caddyfile b/template/Caddyfile index 3215629..b4c1ee1 100644 --- a/template/Caddyfile +++ b/template/Caddyfile @@ -20,7 +20,7 @@ FRONTEND_HOSTNAME { } BACKEND_HOSTNAME { - reverse_proxy varnish:80 + reverse_proxy nginx:80 import global } diff --git a/template/default.vcl b/template/default.vcl deleted file mode 100644 index 89f0fb7..0000000 --- a/template/default.vcl +++ /dev/null @@ -1,5 +0,0 @@ -vcl 4.0; - -backend default { - .host = "piped-backend:8080"; -} diff --git a/template/docker-compose.caddy.yml b/template/docker-compose.caddy.yml index 83112ca..c544582 100644 --- a/template/docker-compose.caddy.yml +++ b/template/docker-compose.caddy.yml @@ -24,19 +24,15 @@ services: depends_on: - postgres container_name: piped-backend - varnish: - image: varnish:7.0-alpine + nginx: + image: nginx:mainline-alpine restart: unless-stopped volumes: - - ./config/default.vcl:/etc/varnish/default.vcl:ro - container_name: varnish + - ./config/nginx.conf:/etc/nginx/nginx.conf:ro + - ./config/pipedapi.conf:/etc/nginx/conf.d/pipedapi.conf:ro + container_name: nginx depends_on: - 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: image: caddy:2-alpine restart: unless-stopped @@ -69,7 +65,7 @@ services: - WATCHTOWER_CLEANUP=true - WATCHTOWER_INCLUDE_RESTARTING=true 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: caddy_data: null piped-proxy: null