Skip to content

Commit

Permalink
fix: Caddy build (#407)
Browse files Browse the repository at this point in the history
  • Loading branch information
dunglas committed May 23, 2023
1 parent 508f623 commit 8a28b07
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 8a28b07

Please sign in to comment.