diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 554588e..c969c85 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -24,6 +24,7 @@ jobs: uses: go-task/setup-task@v2 with: version: 3.x + repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Regenerate Dockerfiles run: task generate diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 71133d1..cc7424a 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -67,7 +67,7 @@ COPY files/general / {{ if .is_frankenphp -}} COPY files/frankenphp / {{ end }} -FROM composer:2.10.1 AS composer +FROM composer/composer:2.10.2-bin AS composer FROM runtime AS builder @@ -149,7 +149,7 @@ paths: EOF -COPY --from=composer /usr/bin/composer /usr/bin/composer +COPY --from=composer /composer /usr/bin/composer FROM node:24.16.0-trixie-slim AS node diff --git a/apache/Dockerfile b/apache/Dockerfile index dcefdab..4c5b764 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -61,7 +61,7 @@ RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bi COPY files/general / -FROM composer:2.10.1 AS composer +FROM composer/composer:2.10.2-bin AS composer FROM runtime AS builder @@ -143,7 +143,7 @@ paths: EOF -COPY --from=composer /usr/bin/composer /usr/bin/composer +COPY --from=composer /composer /usr/bin/composer FROM node:24.16.0-trixie-slim AS node diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 4780f22..b97dd3a 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -61,7 +61,7 @@ RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bi COPY files/general / -FROM composer:2.10.1 AS composer +FROM composer/composer:2.10.2-bin AS composer FROM runtime AS builder @@ -143,7 +143,7 @@ paths: EOF -COPY --from=composer /usr/bin/composer /usr/bin/composer +COPY --from=composer /composer /usr/bin/composer FROM node:24.16.0-trixie-slim AS node diff --git a/frankenphp/Dockerfile b/frankenphp/Dockerfile index af11c7c..84adc07 100644 --- a/frankenphp/Dockerfile +++ b/frankenphp/Dockerfile @@ -66,7 +66,7 @@ RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bi COPY files/general / COPY files/frankenphp / -FROM composer:2.10.1 AS composer +FROM composer/composer:2.10.2-bin AS composer FROM runtime AS builder @@ -148,7 +148,7 @@ paths: EOF -COPY --from=composer /usr/bin/composer /usr/bin/composer +COPY --from=composer /composer /usr/bin/composer FROM node:24.16.0-trixie-slim AS node