From 8a28b071e59929827768b5013affcfdd94b26513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Tue, 23 May 2023 11:01:25 +0200 Subject: [PATCH] fix: Caddy build (#407) --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 40c7317..007dfee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,12 +10,11 @@ FROM composer/composer:2-bin AS composer FROM mlocati/php-extension-installer:latest AS php_extension_installer # Build Caddy with the Mercure and Vulcain modules -FROM caddy:2.6-builder-alpine AS app_caddy_builder +# Temporary fix for https://github.com/dunglas/mercure/issues/770 +FROM caddy:2.7-builder-alpine AS app_caddy_builder -RUN xcaddy build \ - --with github.com/dunglas/mercure \ +RUN xcaddy build v2.6.4 \ --with github.com/dunglas/mercure/caddy \ - --with github.com/dunglas/vulcain \ --with github.com/dunglas/vulcain/caddy # Prod image @@ -121,7 +120,7 @@ RUN set -eux; \ RUN rm -f .env.local.php # Caddy image -FROM caddy:2.6-alpine AS app_caddy +FROM caddy:2-alpine AS app_caddy WORKDIR /srv/app