Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- '8.5'
- '8.5-frankenphp'
- '8.5-www'
runs-on: ubuntu-24.04
runs-on: blacksmith-4vcpu-ubuntu-2404
steps:
- name: Checkout
uses: actions/checkout@v7
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
- '8.5'
- '8.5-frankenphp'
- '8.5-www'
runs-on: ubuntu-24.04-arm
runs-on: blacksmith-4vcpu-ubuntu-2404-arm
steps:
- name: Checkout
uses: actions/checkout@v7
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
- '8.5'
- '8.5-frankenphp'
- '8.5-www'
runs-on: ubuntu-24.04
runs-on: blacksmith-2vcpu-ubuntu-2404
steps:
- name: Checkout
uses: actions/checkout@v7
Expand Down
6 changes: 3 additions & 3 deletions 8.5-frankenphp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libnss3-tools \
&& rm -rf /var/lib/apt/lists/*

# Install PHP extensions
RUN set -eux; install-php-extensions $EXTENSIONS

# Install latest libvips
# @see https://github.com/dooman87/imagemagick-docker/blob/main/Dockerfile.bookworm
ARG VIPS_VERSION=8.18.7
Expand All @@ -40,9 +43,6 @@ ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
COPY --chmod=755 scripts/install-libvips.sh /tmp/install-libvips.sh
RUN /tmp/install-libvips.sh ${VIPS_VERSION} && rm /tmp/install-libvips.sh

# Install PHP extensions
RUN set -eux; install-php-extensions $EXTENSIONS

# Keep frequently changing binaries and startup code after dependency installation.
COPY --from=composer/composer:2-bin /composer /usr/bin/composer
COPY --link --chmod=755 ./8.5-frankenphp/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
Expand Down
2 changes: 1 addition & 1 deletion 8.5-www/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ENV PORT=$PORT SERVER_NAME=":80, :$PORT"
ENV COMPOSER_ALLOW_SUPERUSER=1 COMPOSER_NO_INTERACTION=1 COMPOSER_CACHE_DIR="/tmp"
ENV PHP_INI_SCAN_DIR=":$PHP_INI_DIR/app.conf.d"

ENV EXTENSIONS="amqp apcu ast bcmath exif gd gettext gmp igbinary imagick intl opcache pcntl redis mongodb sockets sysvmsg sysvsem sysvshm uuid xsl zip grpc protobuf opentelemetry zstd symfony/php-ext-deepclone@v0.8.9"
ENV EXTENSIONS="amqp apcu ast bcmath exif gd gettext gmp igbinary imagick intl opcache pcntl redis mongodb sockets sysvmsg sysvsem sysvshm uuid xsl zip protobuf opentelemetry zstd symfony/php-ext-deepclone@v0.8.9"

WORKDIR /app

Expand Down
2 changes: 0 additions & 2 deletions 8.5-www/manifest/usr/local/etc/php/app.conf.d/10-grpc.ini

This file was deleted.

8 changes: 4 additions & 4 deletions 8.5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ENV PUBLIC_DIR=$PUBLIC_DIR
ENV COMPOSER_ALLOW_SUPERUSER=1 COMPOSER_NO_INTERACTION=1 COMPOSER_CACHE_DIR="/tmp"
ENV PHP_INI_SCAN_DIR=":$PHP_INI_DIR/app.conf.d"

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 zstd symfony/php-ext-deepclone@v0.8.9"
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 protobuf opentelemetry zstd symfony/php-ext-deepclone@v0.8.9"

WORKDIR /app

Expand Down Expand Up @@ -55,6 +55,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
pngquant \
&& rm -rf /var/lib/apt/lists/*

# Install PHP extensions
RUN set -eux; install-php-extensions $EXTENSIONS

# Install latest libvips
# @see https://github.com/dooman87/imagemagick-docker/blob/main/Dockerfile.bookworm
ARG VIPS_VERSION=8.18.7
Expand All @@ -64,9 +67,6 @@ ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
COPY --chmod=755 scripts/install-libvips.sh /tmp/install-libvips.sh
RUN /tmp/install-libvips.sh ${VIPS_VERSION} && rm /tmp/install-libvips.sh

# Install PHP extensions
RUN set -eux; install-php-extensions $EXTENSIONS

# Keep frequently changing binaries after dependency installation.
COPY --from=builder /usr/bin/caddy /usr/local/bin/caddy
COPY --from=composer/composer:2-bin /composer /usr/bin/composer
Expand Down
2 changes: 0 additions & 2 deletions 8.5/manifest/usr/local/etc/php/app.conf.d/10-grpc.ini

This file was deleted.

Loading