From bd619ebb8fe785443dbd98ce036989a801449837 Mon Sep 17 00:00:00 2001 From: Kamil Monicz Date: Tue, 9 Jan 2024 01:26:11 +0100 Subject: [PATCH] Host backend on primary domain --- .github/workflows/deploy.yaml | 1 + docker-compose.yml | 17 +++-------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 52fbbc2..9901d06 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -65,6 +65,7 @@ jobs: image_filename="$(basename "${{ env.IMAGE_PATH }}")" cleanup() { + cd ~ echo "Cleaning up" rm -f "$image_filename" } diff --git a/docker-compose.yml b/docker-compose.yml index eec49b4..05c1e66 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -75,20 +75,9 @@ services: depends_on: - app - volumes: - - ./default.vcl:/etc/varnish/default.vcl:ro - - ./data/cache:/var/lib/varnish - - https: - image: caddy:alpine - restart: unless-stopped - - depends_on: - - cache - ports: - - ${LISTEN:-443}:443 + - ${LISTEN:-80}:80 volumes: - - ./Caddyfile:/etc/caddy/Caddyfile:ro - - ./cert:/cert:ro + - ./default.vcl:/etc/varnish/default.vcl:ro + - ./data/cache:/var/lib/varnish