Skip to content

Commit 42f9e5c

Browse files
committed
frankenphp ARG version
1 parent 705cb41 commit 42f9e5c

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

8.5-frankenphp/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ENV PORT=$PORT SERVER_NAME=":80, :$PORT"
99
ENV COMPOSER_ALLOW_SUPERUSER=1 COMPOSER_NO_INTERACTION=1 COMPOSER_CACHE_DIR="/tmp"
1010
ENV PHP_INI_SCAN_DIR=":$PHP_INI_DIR/app.conf.d"
1111

12-
ENV EXTENSIONS="amqp apcu ast bcmath exif ffi gd gettext gmp igbinary imagick intl maxminddb mongodb opcache pcntl pdo_mysql pdo_pgsql redis sockets sysvmsg sysvsem sysvshm uuid xsl zip"
12+
ENV EXTENSIONS="amqp apcu ast bcmath exif ffi gd gettext gmp igbinary imagick intl maxminddb mongodb opcache pcntl pdo_mysql pdo_pgsql redis sockets sysvmsg sysvsem sysvshm uuid xsl zip opentelemetry"
1313

1414
ENV BUILD_DEPS="make git autoconf wget"
1515

8.5-www/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
ARG CADDY_VERSION=2.11
2+
ARG FRANKENPHP_VERSION=1.11.3
23

34
FROM caddy:${CADDY_VERSION}-builder AS caddy-builder
45

56
# -----------------------------------------------------
67
# FrankenPHP Build
78
# -----------------------------------------------------
8-
FROM dunglas/frankenphp:1-builder-php8.5-trixie AS builder
9+
FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-builder-php8.5-trixie AS builder
910

1011
# Copy xcaddy from caddy builder
1112
COPY --from=caddy-builder /usr/bin/xcaddy /usr/bin/xcaddy
@@ -29,7 +30,7 @@ RUN CGO_ENABLED=1 \
2930
# -----------------------------------------------------
3031
# FrankenPHP
3132
#------------------------------------------------------
32-
FROM dunglas/frankenphp:1-php8.5-trixie
33+
FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php8.5-trixie
3334

3435
# Replace the official binary with the one containing custom modules
3536
COPY --from=builder /usr/local/bin/frankenphp /usr/local/bin/frankenphp

8.5/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ENV PUBLIC_DIR=$PUBLIC_DIR
5555
ENV COMPOSER_ALLOW_SUPERUSER=1 COMPOSER_NO_INTERACTION=1 COMPOSER_CACHE_DIR="/tmp"
5656
ENV PHP_INI_SCAN_DIR=":$PHP_INI_DIR/app.conf.d"
5757

58-
ENV EXTENSIONS="amqp apcu ast bcmath exif ffi gd gettext gmp igbinary imagick intl maxminddb mongodb opcache pcntl pdo_mysql pdo_pgsql redis sockets sysvmsg sysvsem sysvshm uuid xsl zip grpc protobuf"
58+
ENV EXTENSIONS="amqp apcu ast bcmath exif ffi gd gettext gmp igbinary imagick intl maxminddb mongodb opcache pcntl pdo_mysql pdo_pgsql redis sockets sysvmsg sysvsem sysvshm uuid xsl zip grpc protobuf opentelemetry"
5959

6060
ENV BUILD_DEPS="make git autoconf wget"
6161

@@ -74,6 +74,8 @@ RUN chmod +x /usr/local/bin/install-php-extensions
7474
# Install required packages
7575
RUN apt-get update && apt-get install -y --no-install-recommends ${BUILD_DEPS} \
7676
acl \
77+
ca-certificates \
78+
curl \
7779
file \
7880
gettext \
7981
procps \

0 commit comments

Comments
 (0)