Skip to content

Commit 42b0c2e

Browse files
authored
Merge pull request #242 from laminas/1.40.x-merge-up-into-2.0.x_cEXDafLR
Merge release 1.40.0 into 2.0.x
2 parents f6aea59 + f390016 commit 42b0c2e

File tree

8 files changed

+350
-293
lines changed

8 files changed

+350
-293
lines changed

.github/workflows/build-and-push-containers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
latest=false
4343
4444
- name: Build image. Push for release
45-
uses: docker/build-push-action@v5
45+
uses: docker/build-push-action@v6
4646
with:
4747
context: .
4848
file: ./Dockerfile

Dockerfile

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG NODE_MAJOR=20
22

33
# Aliasing base images, so we can change just this, when needing to upgrade or pull base layers
44
FROM ubuntu:22.04 AS base-distro
5-
FROM composer:2.7.1 AS composer
5+
FROM composer:2.7.7 AS composer
66

77
FROM base-distro AS install-markdownlint
88
ARG NODE_MAJOR
@@ -151,6 +151,22 @@ RUN set -eux; \
151151
php8.3-xml \
152152
php8.3-xsl \
153153
php8.3-zip \
154+
\
155+
php8.4-cli \
156+
php8.4-bcmath \
157+
php8.4-bz2 \
158+
php8.4-curl \
159+
php8.4-dev \
160+
php8.4-fileinfo \
161+
php8.4-intl \
162+
php8.4-mbstring \
163+
php8.4-phar \
164+
php8.4-phpdbg \
165+
php8.4-readline \
166+
php8.4-sockets \
167+
php8.4-xml \
168+
php8.4-xsl \
169+
php8.4-zip \
154170
&& apt autoremove -y \
155171
&& apt clean
156172

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ The container the action provides and consumes builds off the ubuntu:focal image
261261
- 8.1
262262
- 8.2
263263
- 8.3
264+
- 8.4
264265

265266
Each provides the following extensions by default:
266267

0 commit comments

Comments
 (0)