Skip to content

Commit 2cdd9cb

Browse files
committed
Merge branch 'main' into v3
# Conflicts: # Makefile # php-80/Dockerfile # php-81/Dockerfile
2 parents 064a539 + dbe220a commit 2cdd9cb

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

php-82/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ RUN make -j $(nproc) && make install
254254
# # - libnghttp2
255255
# # Needed by:
256256
# # - php
257-
ENV VERSION_CURL=8.12.1
257+
ENV VERSION_CURL=8.14.1
258258
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
259259
RUN set -xe; \
260260
mkdir -p ${CURL_BUILD_DIR}/bin; \
@@ -384,7 +384,7 @@ RUN make && make install
384384
# Needed by:
385385
# - php
386386
RUN LD_LIBRARY_PATH= yum install -y tcl
387-
ENV VERSION_SQLITE=3.49.2
387+
ENV VERSION_SQLITE=3.50.0
388388
ENV SQLITE_BUILD_DIR=${BUILD_DIR}/sqlite
389389
RUN set -xe; \
390390
mkdir -p ${SQLITE_BUILD_DIR}; \

php-83/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ARG IMAGE_VERSION_SUFFIX
55

66
# https://www.php.net/downloads
7-
ARG VERSION_PHP=8.3.21
7+
ARG VERSION_PHP=8.3.22
88

99

1010
# Lambda uses a custom AMI named Amazon Linux 2
@@ -254,7 +254,7 @@ RUN make -j $(nproc) && make install
254254
# # - libnghttp2
255255
# # Needed by:
256256
# # - php
257-
ENV VERSION_CURL=8.12.1
257+
ENV VERSION_CURL=8.14.1
258258
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
259259
RUN set -xe; \
260260
mkdir -p ${CURL_BUILD_DIR}/bin; \
@@ -384,7 +384,7 @@ RUN make && make install
384384
# Needed by:
385385
# - php
386386
RUN LD_LIBRARY_PATH= yum install -y tcl
387-
ENV VERSION_SQLITE=3.49.2
387+
ENV VERSION_SQLITE=3.50.0
388388
ENV SQLITE_BUILD_DIR=${BUILD_DIR}/sqlite
389389
RUN set -xe; \
390390
mkdir -p ${SQLITE_BUILD_DIR}; \

php-84/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ARG IMAGE_VERSION_SUFFIX
55

66
# https://www.php.net/downloads
7-
ARG VERSION_PHP=8.4.7
7+
ARG VERSION_PHP=8.4.8
88

99

1010
# Lambda uses a custom AMI named Amazon Linux 2
@@ -254,7 +254,7 @@ RUN make -j $(nproc) && make install
254254
# # - libnghttp2
255255
# # Needed by:
256256
# # - php
257-
ENV VERSION_CURL=8.12.1
257+
ENV VERSION_CURL=8.14.1
258258
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
259259
RUN set -xe; \
260260
mkdir -p ${CURL_BUILD_DIR}/bin; \
@@ -387,7 +387,7 @@ RUN make && make install
387387
# Needed by:
388388
# - php
389389
RUN LD_LIBRARY_PATH= yum install -y tcl
390-
ENV VERSION_SQLITE=3.49.2
390+
ENV VERSION_SQLITE=3.50.0
391391
ENV SQLITE_BUILD_DIR=${BUILD_DIR}/sqlite
392392
RUN set -xe; \
393393
mkdir -p ${SQLITE_BUILD_DIR}; \

src/bootstrap.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<?php declare(strict_types=1);
22

3+
// Force errors to be logged to stdout so that they end up in CloudWatch.
4+
// In the `function` runtime this is already `1`, but in the `fpm` runtime it is `0` by default.
5+
// Here we are forcing it to `1` in the bootstrap process, it will not impact the application code
6+
// as it runs in different processes (FPM worker) and those will have `display_errors=0`.
7+
ini_set('display_errors', '1');
8+
39
$appRoot = getenv('LAMBDA_TASK_ROOT');
410

511
$autoloadPath = $_SERVER['BREF_AUTOLOAD_PATH'] ?? null;

0 commit comments

Comments
 (0)