Skip to content

Commit 01f27f8

Browse files
authored
Merge pull request #59 from specsnl/updates
Move to composer/composer image and re-add go-task GitHub token
2 parents 7215ee4 + 6c94175 commit 01f27f8

5 files changed

Lines changed: 9 additions & 8 deletions

File tree

.github/workflows/pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
uses: go-task/setup-task@v2
2525
with:
2626
version: 3.x
27+
repo-token: ${{ secrets.GITHUB_TOKEN }}
2728

2829
- name: Regenerate Dockerfiles
2930
run: task generate

Dockerfile.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ COPY files/general /
6767
{{ if .is_frankenphp -}}
6868
COPY files/frankenphp /
6969
{{ end }}
70-
FROM composer:2.10.1 AS composer
70+
FROM composer/composer:2.10.2-bin AS composer
7171
7272
FROM runtime AS builder
7373
@@ -149,7 +149,7 @@ paths:
149149
150150
EOF
151151
152-
COPY --from=composer /usr/bin/composer /usr/bin/composer
152+
COPY --from=composer /composer /usr/bin/composer
153153
154154
FROM node:24.16.0-trixie-slim AS node
155155

apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bi
6161

6262
COPY files/general /
6363

64-
FROM composer:2.10.1 AS composer
64+
FROM composer/composer:2.10.2-bin AS composer
6565

6666
FROM runtime AS builder
6767

@@ -143,7 +143,7 @@ paths:
143143

144144
EOF
145145

146-
COPY --from=composer /usr/bin/composer /usr/bin/composer
146+
COPY --from=composer /composer /usr/bin/composer
147147

148148
FROM node:24.16.0-trixie-slim AS node
149149

fpm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bi
6161

6262
COPY files/general /
6363

64-
FROM composer:2.10.1 AS composer
64+
FROM composer/composer:2.10.2-bin AS composer
6565

6666
FROM runtime AS builder
6767

@@ -143,7 +143,7 @@ paths:
143143

144144
EOF
145145

146-
COPY --from=composer /usr/bin/composer /usr/bin/composer
146+
COPY --from=composer /composer /usr/bin/composer
147147

148148
FROM node:24.16.0-trixie-slim AS node
149149

frankenphp/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bi
6666
COPY files/general /
6767
COPY files/frankenphp /
6868

69-
FROM composer:2.10.1 AS composer
69+
FROM composer/composer:2.10.2-bin AS composer
7070

7171
FROM runtime AS builder
7272

@@ -148,7 +148,7 @@ paths:
148148

149149
EOF
150150

151-
COPY --from=composer /usr/bin/composer /usr/bin/composer
151+
COPY --from=composer /composer /usr/bin/composer
152152

153153
FROM node:24.16.0-trixie-slim AS node
154154

0 commit comments

Comments
 (0)