From 2749ad62e31c0e2d7c6d4e42edea238a6ff09de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Sun, 4 Apr 2021 00:58:21 +0200
Subject: [PATCH] fix: issue preventing Caddy to start (#125)

* fix: issue preventing Caddy to start

* ci: remove counter-productive Docker Compose cache action
---
 .github/workflows/ci.yml | 2 --
 Dockerfile               | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5be17d8..1daa3af 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,8 +13,6 @@ jobs:
               uses: actions/checkout@v2
             - name: Pull images
               run: docker-compose pull
-            - uses: satackey/action-docker-layer-caching@v0.0.8
-              continue-on-error: true
             - name: Start services
               run: docker-compose up --build -d
             - name: Wait for services
diff --git a/Dockerfile b/Dockerfile
index 840bedf..e934418 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -113,8 +113,7 @@ CMD ["php-fpm"]
 FROM caddy:${CADDY_VERSION}-builder-alpine AS symfony_caddy_builder
 
 RUN xcaddy build \
-	--with github.com/dunglas/mercure@main \
-	--with github.com/dunglas/mercure/caddy@main \
+	--with github.com/dunglas/mercure/caddy \
 	--with github.com/dunglas/vulcain/caddy
 
 FROM caddy:${CADDY_VERSION} AS symfony_caddy