lail/ebs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: fix C.I and bump caddy version

Browse source
This commit is contained in:
Léa BAR 2026-04-29 16:14:24 +02:00
parent f3533c4b36
commit 9deffcff4a
No known key found for this signature in database
GPG key ID: 537DA1EC6CA7571D
1 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Dockerfile
View file

@ -5,7 +5,7 @@
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
ARG PHP_VERSION=8.2 ARG PHP_VERSION=8.2
ARG CADDY_VERSION=2.10.2 ARG CADDY_VERSION=2.11.2
# yarn build # yarn build
FROM node AS yarn_build FROM node AS yarn_build
@ -15,7 +15,7 @@ RUN mkdir -p /usr/app/vendor/symfony
RUN curl -L https://github.com/symfony/ux-autocomplete/archive/v2.7.1.tar.gz -o ux-autocomplete.tar.gz RUN curl -L https://github.com/symfony/ux-autocomplete/archive/v2.7.1.tar.gz -o ux-autocomplete.tar.gz
RUN tar -xzvf ux-autocomplete.tar.gz --directory /usr/app/vendor/symfony RUN tar -xzvf ux-autocomplete.tar.gz --directory /usr/app/vendor/symfony
RUN mv /usr/app/vendor/symfony/ux-autocomplete-2.7.1 /usr/app/vendor/symfony/ux-autocomplete RUN mv /usr/app/vendor/symfony/ux-autocomplete-2.7.1 /usr/app/vendor/symfony/ux-autocomplete
COPY package.json yarn.lock . COPY package.json yarn.lock ./
RUN yarn install RUN yarn install
COPY . . COPY . .
RUN yarn build RUN yarn build
@ -183,32 +183,19 @@ RUN set -eux; \
RUN rm -f .env.local.php RUN rm -f .env.local.php
# Build Caddy with the Mercure and Vulcain modules # Build Caddy with the Mercure and Vulcain modules
FROM caddy:${CADDY_VERSION}-builder-alpine AS app_caddy_builder
# Temporary fix for https://github.com/dunglas/mercure/issues/770
# https://github.com/dunglas/symfony-docker/pull/407/files
# FROM caddy:2.9.1-builder-alpine AS app_caddy_builder
# RUN xcaddy build \
# --with github.com/dunglas/mercure \
# --with github.com/dunglas/mercure/caddy \
# --with github.com/dunglas/vulcain \
# --with github.com/dunglas/vulcain/caddy
RUN xcaddy build \
--with github.com/dunglas/mercure/caddy \
--with github.com/dunglas/vulcain/caddy
# Caddy image # Caddy image
FROM caddy:${CADDY_VERSION} AS app_caddy FROM caddy:${CADDY_VERSION} AS app_caddy
ARG TARGETARCH
WORKDIR /srv/app
ADD --chmod=500 "https://caddyserver.com/api/download?os=linux&arch=$TARGETARCH&p=github.com/dunglas/mercure/caddy&p=github.com/dunglas/vulcain/caddy" /usr/bin/caddy
COPY --from=app_php /srv/app/public public/
COPY docker/caddy/Caddyfile /etc/caddy/Caddyfile
# needed for security update until base image is updated # needed for security update until base image is updated
#RUN apk upgrade libcurl curl openssl openssl-dev libressl libcrypto1.1 libssl1.1 libcrypto3 libssl3 #RUN apk upgrade libcurl curl openssl openssl-dev libressl libcrypto1.1 libssl1.1 libcrypto3 libssl3
WORKDIR /srv/app WORKDIR /srv/app
COPY --from=app_caddy_builder /usr/bin/caddy /usr/bin/caddy
COPY --from=app_php /srv/app/public public/
COPY docker/caddy/Caddyfile /etc/caddy/Caddyfile