update php 8.x images to bookworm

builders/php.js

@@ -127,7 +127,7 @@ module.exports = {
       pool: '/usr/local/etc/php-fpm.d/zz-lando.conf',
     },
     sources: [],
-    suffix: '4',
+    suffix: '5',
     ssl: false,
     via: 'apache',
     volumes: ['/usr/local/bin'],

examples/5.6/.lando.yml

@@ -25,7 +25,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:5.6-fpm-4
+      image: devwithlando/php:5.6-fpm-5
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/7.0/.lando.yml

@@ -30,7 +30,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:7.0-fpm-4
+      image: devwithlando/php:7.0-fpm-5
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/7.1/.lando.yml

@@ -29,7 +29,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:7.1-fpm-4
+      image: devwithlando/php:7.1-fpm-5
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/7.2/.lando.yml

@@ -29,7 +29,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:7.2-fpm-4
+      image: devwithlando/php:7.2-fpm-5
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/7.3/.lando.yml

@@ -29,7 +29,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:7.3-fpm-4
+      image: devwithlando/php:7.3-fpm-5
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/7.4/.lando.yml

@@ -29,7 +29,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:7.4-fpm-4
+      image: devwithlando/php:7.4-fpm-5
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/8.0/.lando.yml

@@ -29,7 +29,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:8.0-fpm-4
+      image: devwithlando/php:8.0-fpm-5
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/8.1/.lando.yml

@@ -29,7 +29,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:8.1-fpm-4
+      image: devwithlando/php:8.1-fpm-5
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/8.2/.lando.yml

@@ -29,7 +29,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:8.2-fpm-4
+      image: devwithlando/php:8.2-fpm-5
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/8.3/.lando.yml

@@ -29,7 +29,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:8.3-fpm-4
+      image: devwithlando/php:8.3-fpm-5
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/8.4/.lando.yml

@@ -28,7 +28,7 @@ services:
     config:
       php: config/php.ini
     overrides:
-      image: devwithlando/php:8.4-fpm-4
+      image: devwithlando/php:8.4-fpm-5
       environment:
         DUALBLADE: maxim
         OTHER: thing

examples/custom/.lando.yml

@@ -18,7 +18,7 @@ services:
       pool: config/www.conf
     composer_version: '2.1.14'
     overrides:
-      image: devwithlando/php:8.1-fpm-4
+      image: devwithlando/php:8.1-fpm-5
 tooling:
   node:
     service: :host

examples/custom/Dockerfile.node

@@ -1,4 +1,4 @@
-FROM devwithlando/php:7.4-apache-4
+FROM devwithlando/php:7.4-apache-5
 
 # Choose the major node version
 ENV NODE_VERSION=12

examples/php-extensions/Dockerfile.custom

@@ -1,4 +1,4 @@
-FROM devwithlando/php:7.4-apache-4
+FROM devwithlando/php:7.4-apache-5
 
 # Add php extension helper
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/

images/5.6-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:5.6-apache-4 .
+# docker build -t devwithlando/php:5.6-apache-5 .
 
 FROM php:5.6-apache-stretch
 

images/5.6-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:5.6-fpm-4 .
+# docker build -t devwithlando/php:5.6-fpm-5 .
 
 FROM php:5.6-fpm-stretch
 

images/7.0-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.0-apache-4 .
+# docker build -t devwithlando/php:7.0-apache-5 .
 
 FROM php:7.0-apache-stretch
 

images/7.0-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.0-fpm-4 .
+# docker build -t devwithlando/php:7.0-fpm-5 .
 
 FROM php:7.0-fpm-stretch
 

images/7.1-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.1-apache-4 .
+# docker build -t devwithlando/php:7.1-apache-5 .
 
 FROM php:7.1-apache-buster
 

images/7.1-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.1-fpm-4 .
+# docker build -t devwithlando/php:7.1-fpm-5 .
 
 FROM php:7.1-fpm-buster
 

images/7.2-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.2-apache-4 .
+# docker build -t devwithlando/php:7.2-apache-5 .
 
 FROM php:7.2-apache-buster
 

images/7.2-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.2-fpm-4 .
+# docker build -t devwithlando/php:7.2-fpm-5 .
 
 FROM php:7.2-fpm-buster
 

images/7.3-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.3-apache-4 .
+# docker build -t devwithlando/php:7.3-apache-5 .
 
 FROM php:7.3-apache-bullseye
 

images/7.3-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.3-fpm-4 .
+# docker build -t devwithlando/php:7.3-fpm-5 .
 
 FROM php:7.3-fpm-bullseye
 

images/7.4-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.4-apache-4 .
+# docker build -t devwithlando/php:7.4-apache-5 .
 
 FROM php:7.4-apache-bullseye
 

images/7.4-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.4-fpm-4 .
+# docker build -t devwithlando/php:7.4-fpm-5 .
 
 FROM php:7.4-fpm-bullseye
 

images/8.0-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.0-apache-4 .
+# docker build -t devwithlando/php:8.0-apache-5 .
 
 FROM php:8.0-apache-bullseye
 

images/8.0-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.0-fpm-4 .
+# docker build -t devwithlando/php:8.0-fpm-5 .
 
 FROM php:8.0-fpm-bullseye
 

images/8.1-apache/Dockerfile

@@ -1,81 +1,55 @@
-# docker build -t devwithlando/php:8.1-apache-4 .
+# docker build -t devwithlando/php:8.1-apache-5 .
 
-FROM php:8.1-apache-bullseye
+FROM php:8.1-apache-bookworm
 
-# Install dependencies we need
-RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
-    bzip2 \
-    default-mysql-client \
-    exiftool \
-    git-core \
-    gnupg2 \
-    imagemagick \
-    libbz2-dev \
-    libc-client-dev \
-    libfreetype6-dev \
-    libicu-dev \
-    libjpeg62-turbo-dev \
-    libkrb5-dev \
-    libldap2-dev \
-    libmagickwand-dev \
-    libmemcached-dev \
-    libpng-dev \
-    libpq-dev \
-    libssl-dev \
-    libwebp-dev \
-    libxml2-dev \
-    libzip-dev \
-    libonig-dev \
-    openssl \
-    postgresql-client-13 \
-    pv \
-    rsync \
-    ssh \
-    unzip \
-    wget \
-    xfonts-75dpi \
-    xfonts-base \
-    zlib1g-dev \
-  && pecl install apcu \
-  && pecl install imagick \
-  && pecl install memcached \
-  && pecl install oauth \
-  && pecl install redis-5.3.7 \
-  && pecl install xdebug \
-  && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \
-  && docker-php-ext-enable apcu \
-  && docker-php-ext-enable imagick \
-  && docker-php-ext-enable memcached \
-  && docker-php-ext-enable oauth \
-  && docker-php-ext-enable redis \
-  && docker-php-ext-install bcmath \
-  && docker-php-ext-install bz2 \
-  && docker-php-ext-install calendar \
-  && docker-php-ext-install exif \
-  && docker-php-ext-install gettext \
-  && docker-php-ext-install intl \
-  && docker-php-ext-install ldap \
-  && docker-php-ext-install mbstring \
-  && docker-php-ext-install mysqli \
-  && docker-php-ext-install opcache \
-  && docker-php-ext-install pcntl \
-  && docker-php-ext-install pdo \
-  && docker-php-ext-install pdo_mysql \
-  && docker-php-ext-install pdo_pgsql \
-  && docker-php-ext-install soap \
-  && docker-php-ext-install zip \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
-  && php -r "unlink('composer-setup.php');" \
-  && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
+  default-mysql-client \
+  exiftool \
+  git-core \
+  gnupg2 \
+  openssl \
+  postgresql-client-15 \
+  pv \
+  rsync \
+  ssh \
+  unzip \
+  wget
+
+RUN \
+  install-php-extensions @fix_letsencrypt \
+  && install-php-extensions apcu \
+  && install-php-extensions bcmath \
+  && install-php-extensions bz2 \
+  && install-php-extensions calendar \
+  && install-php-extensions exif \
+  && install-php-extensions gd \
+  && install-php-extensions gettext \
+  && install-php-extensions imap \
+  && install-php-extensions intl \
+  && install-php-extensions ldap \
+  && install-php-extensions mbstring \
+  && install-php-extensions memcached \
+  && install-php-extensions mysqli \
+  && install-php-extensions oauth \
+  && install-php-extensions opcache \
+  && install-php-extensions pcntl \
+  && install-php-extensions pdo \
+  && install-php-extensions pdo_mysql \
+  && install-php-extensions pdo_pgsql \
+  && install-php-extensions redis \
+  && install-php-extensions soap \
+  && install-php-extensions xdebug \
+  && install-php-extensions zip
+
+RUN install-php-extensions @composer-2
+
+RUN \
+  chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \
-  && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* \
-  && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
-  && docker-php-ext-install imap \
-  && docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp --with-freetype \
-  && docker-php-ext-install gd
-
-RUN curl https://dl.yarnpkg.com
+  && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/*