@lando/php 1.2.0 → 1.4.0

package/.lando.yml

@@ -1,14 +1,24 @@
-name: lando-php-plugin
+name: docs.php
+proxy:
+  cli:
+    - docs.php.lndo.site:5173
 services:
-  node:
-    type: node:18
-    build:
-      - npm install
+  cli:
+    api: 4
+    image: node:18
+    command: sleep infinity
+    ports:
+      - 5173:5173/http
     scanner: false
-    ssl: false
-    sslExpose: false
+    user: node
+    build:
+      app: |
+        npm install
 tooling:
   node:
-    service: node
+    service: cli
   npm:
-    service: node
+    service: cli
+  vitepress:
+    service: cli
+    cmd: npx vitepress

package/.nyc_output/processinfo/f05431a6-4424-40ba-9a42-3a54b790a1bc.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2373,"argv":["/opt/hostedtoolcache/node/18.20.4/x64/bin/node","/home/runner/work/php/php/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/php/php","time":1729179411993,"ppid":2372,"coverageFilename":"/home/runner/work/php/php/.nyc_output/f05431a6-4424-40ba-9a42-3a54b790a1bc.json","externalId":"","uuid":"f05431a6-4424-40ba-9a42-3a54b790a1bc","files":[]}

package/.nyc_output/processinfo/fc61a4ce-cfd4-410a-a9a6-4942c26f55a2.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2384,"argv":["/opt/hostedtoolcache/node/18.20.4/x64/bin/node","/home/runner/work/php/php/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/php/php","time":1729179412170,"ppid":2373,"coverageFilename":"/home/runner/work/php/php/.nyc_output/fc61a4ce-cfd4-410a-a9a6-4942c26f55a2.json","externalId":"","uuid":"fc61a4ce-cfd4-410a-a9a6-4942c26f55a2","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"927b5cd6-2a94-4b26-ac08-3ff93f5da197":{"parent":null,"children":[]},"b107e51d-27b5-4645-90dd-ca6c345830fa":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
+{"processes":{"f05431a6-4424-40ba-9a42-3a54b790a1bc":{"parent":null,"children":[]},"fc61a4ce-cfd4-410a-a9a6-4942c26f55a2":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/CHANGELOG.md

@@ -1,37 +1,59 @@
+## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
+
+## v1.4.0 - [October 17, 2024](https://github.com/lando/php/releases/tag/v1.4.0)
+
+* Fixed bug causing `CA` and `certs` to not be appropriately installed in the `appserver` when using `nginx`
+* Updated to [@lando/nginx@1.3.0](https://github.com/lando/nginx/releases/tag/v1.3.0) [#131](https://github.com/lando/php/issues/131)
+* Updated all images `>=5.6` to `gen4`
+
+## v1.3.0 - [March 8, 2024](https://github.com/lando/php/releases/tag/v1.3.0)
+
+* Updated to latest database services.
+
 ## v1.2.0 - [February 16, 2024](https://github.com/lando/php/releases/tag/v1.2.0)
-  * Get PHP image builds working to make PHP 8.3 images available. **Note Imagick is [temporarily unavailable](https://github.com/Imagick/imagick/pull/641)!**
-  * Stable version of xdebug for PHP 8.3. [#91](https://github.com/lando/php/pull/91)
+
+* Get PHP image builds working to make PHP 8.3 images available. **Note Imagick is [temporarily unavailable](https://github.com/Imagick/imagick/pull/641)!**
+* Stable version of xdebug for PHP 8.3. [#91](https://github.com/lando/php/pull/91)
 
 ## v1.1.0 - [January 29, 2024](https://github.com/lando/php/releases/tag/v1.1.0)
-  * Add support for PHP 8.3. [#77](https://github.com/lando/php/issues/77)
+
+* Add support for PHP 8.3. [#77](https://github.com/lando/php/issues/77)
 
 ## v1.0.0 - [December 7, 2023](https://github.com/lando/php/releases/tag/v1.0.0)
-  * Dialed fully for `lando update`
+
+* Dialed fully for `lando update`
 
 ## v0.10.2 - [November 28, 2023](https://github.com/lando/php/releases/tag/v0.10.2)
-  * Added option to override the image powering the service.
-  * Removed apparmor step from image building.
+
+* Added option to override the image powering the service.
+* Removed apparmor step from image building.
 
 ## v0.10.1 - [November 27, 2023](https://github.com/lando/php/releases/tag/v0.10.1)
-  * Removed relative references to dependencies.
-  * Added nginxServiceType option so other services can override the default `php-nginx` service with their own.
+
+* Removed relative references to dependencies.
+* Added nginxServiceType option so other services can override the default `php-nginx` service with their own.
 
 ## v0.10.0 - [November 21, 2023](https://github.com/lando/php/releases/tag/v0.10.0)
-  * Removed MultiViews from Apache config. [#66](https://github.com/lando/php/issues/66)
-  * Isolated PHP to work as a standalone service. [#78](https://github.com/lando/php/pull/78)
+
+* Removed MultiViews from Apache config. [#66](https://github.com/lando/php/issues/66)
+* Isolated PHP to work as a standalone service. [#78](https://github.com/lando/php/pull/78)
 
 ## v0.9.0 - [July 3, 2023](https://github.com/lando/php/releases/tag/v0.9.0)
-  * Removed bundle-dependencies and version-bump-prompt from plugin.
-  * Updated package to use prepare-release-action.
-  * Updated documentation to reflect new release process.
+
+* Removed bundle-dependencies and version-bump-prompt from plugin.
+* Updated package to use prepare-release-action.
+* Updated documentation to reflect new release process.
 
 ## v0.8.0 - [April 17th, 2023](https://github.com/lando/php/releases/tag/v0.8.0)
+
 * Bumped Redis plugin to redis-5.3.7. [#57](https://github.com/lando/php/pull/57)
 
 ## v0.7.1 - [January 6th, 2023](https://github.com/lando/php/releases/tag/v0.7.1)
+
 * Added support for PHP 8.2 [#51](https://github.com/lando/php/pull/51)
 
 ## v0.7.0 - [December 12, 2022](https://github.com/lando/php/releases/tag/v0.7.0)
+
 * Added bundle-dependencies to release process.
 * Fixed bug in plugin dogfooding test.
 

package/README.md

@@ -39,6 +39,11 @@ If you'd like to report a bug or submit a feature request then please [use the i
 
 We try to log all changes big and small in both [THE CHANGELOG](https://github.com/lando/php/blob/main/CHANGELOG.md) and the [release notes](https://github.com/lando/php/releases).
 
+## Maintainers
+
+* [@pirog](https://github.com/pirog)
+* [@reynoldsalec](https://github.com/reynoldsalec)
+
 ## Contributors
 
 <a href="https://github.com/lando/php/graphs/contributors">

package/builders/php.js

@@ -67,7 +67,7 @@ const parseNginx = options => {
   options.remoteFiles.vhosts = '/opt/bitnami/nginx/conf/lando.conf';
   options.defaultFiles.vhosts = (options.ssl) ? 'default-ssl.conf.tpl' : 'default.conf.tpl';
   options.nginxSsl = options.ssl;
-  options.ssl = false;
+  options.sslExpose = false;
   if (process.platform === 'win32') {
     options.volumes.push(`${options.confDest}/zz-lando.conf:/usr/local/etc/php-fpm.d/zz-lando.conf`);
   }
@@ -94,7 +94,6 @@ module.exports = {
     supported: ['8.3', '8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
     legacy: ['7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
     gen2: ['5.5', '5.4', '5.3'],
-    gen3: ['7.2', '7.1', '7.0', '5.6'],
     path: [
       '/app/vendor/bin',
       '/app/bin',
@@ -125,6 +124,7 @@ module.exports = {
       _php: '/usr/local/etc/php/conf.d/xxx-lando-default.ini',
       vhosts: '/etc/apache2/sites-enabled/000-default.conf',
       php: '/usr/local/etc/php/conf.d/zzz-lando-my-custom.ini',
+      pool: '/usr/local/etc/php-fpm.d/zz-lando.conf',
     },
     sources: [],
     suffix: '4',
@@ -140,7 +140,7 @@ module.exports = {
       options = parseConfig(_.merge({}, config, options));
       // Mount our default php config
       options.volumes.push(`${options.confDest}/${options.defaultFiles._php}:${options.remoteFiles._php}`);
-
+      options.volumes.push(`${options.confDest}/${options.defaultFiles.pool}:${options.remoteFiles.pool}`);
       // Shift on the docker entrypoint if this is a more recent version
       if (options.version !== 'custom' && semver.gt(semver.coerce(options.version), '5.5.0')) {
         options.command.unshift('docker-php-entrypoint');
@@ -149,14 +149,12 @@ module.exports = {
       // If xdebug is set to "true" then map it to "debug"
       if (options.xdebug === true) options.xdebug = 'debug';
 
-      // If this is a legacy php version then switch the suffix
-      if (_.includes(options.gen3, options.version)) options.suffix = '3';
+      // for older generation models
       if (_.includes(options.gen2, options.version)) options.suffix = '2';
 
       // Build the php
       const php = {
-        image: _.get(options, 'image') ?
-          options.image : `devwithlando/php:${options.version}-${options.phpServer}-${options.suffix}`,
+        image: options.image ?? `devwithlando/php:${options.version}-${options.phpServer}-${options.suffix}`,
         environment: _.merge({}, options.environment, {
           PATH: options.path.join(':'),
           LANDO_WEBROOT: `/app/${options.webroot}`,

package/coverage/index.html

@@ -86,7 +86,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-02-16T19:33:47.229Z
+                at 2024-10-17T15:36:52.378Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/images/5.6-apache/Dockerfile

@@ -1,9 +1,14 @@
-# docker build -t devwithlando/php:5.6-apache-3 .
+# docker build -t devwithlando/php:5.6-apache-4 .
 
 FROM php:5.6-apache-stretch
 
 # Install dependencies we need
-RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+RUN \
+  sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
+  && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
+  && sed -i '/stretch-updates/d' /etc/apt/sources.list \
+  && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
+  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     gnupg2 \
     wget \

package/images/5.6-fpm/Dockerfile

@@ -1,9 +1,14 @@
-# docker build -t devwithlando/php:5.6-fpm-3 .
+# docker build -t devwithlando/php:5.6-fpm-4 .
 
 FROM php:5.6-fpm-stretch
 
 # Install dependencies we need
-RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+RUN \
+  sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
+  && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
+  && sed -i '/stretch-updates/d' /etc/apt/sources.list \
+  && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
+  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     gnupg2 \
     wget \

package/images/7.0-apache/Dockerfile

@@ -1,9 +1,14 @@
-# docker build -t devwithlando/php:7.0-apache-3 .
+# docker build -t devwithlando/php:7.0-apache-4 .
 
 FROM php:7.0-apache-stretch
 
 # Install dependencies we need
-RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+RUN \
+  sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
+  && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
+  && sed -i '/stretch-updates/d' /etc/apt/sources.list \
+  && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
+  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     gnupg2 \
     wget \

package/images/7.0-fpm/Dockerfile

@@ -1,9 +1,14 @@
-# docker build -t devwithlando/php:7.0-fpm-3 .
+# docker build -t devwithlando/php:7.0-fpm-4 .
 
 FROM php:7.0-fpm-stretch
 
 # Install dependencies we need
-RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+RUN \
+  sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
+  && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
+  && sed -i '/stretch-updates/d' /etc/apt/sources.list \
+  && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
+  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     gnupg2 \
     wget \

package/images/7.1-apache/Dockerfile

@@ -1,19 +1,19 @@
-# docker build -t devwithlando/php:7.1-apache-3 .
+# docker build -t devwithlando/php:7.1-apache-4 .
 
 FROM php:7.1-apache-buster
 
 # Install dependencies we need
-RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
-    gnupg2 \
-    wget \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+RUN \
+  sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
+  && sed -i '/security.debian.org/s/^/#/' /etc/apt/sources.list \
+  && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
+  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt-get update && apt-get install -y \
     bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
+    gnupg2 \
     imagemagick \
     libbz2-dev \
     libc-client-dev \
@@ -32,7 +32,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     libzip-dev \
     libonig-dev \
     openssl \
-    postgresql-client-10 \
+    postgresql-client-11 \
     pv \
     rsync \
     ssh \

package/images/7.1-fpm/Dockerfile

@@ -1,19 +1,19 @@
-# docker build -t devwithlando/php:7.1-fpm-3 .
+# docker build -t devwithlando/php:7.1-fpm-4 .
 
 FROM php:7.1-fpm-buster
 
 # Install dependencies we need
-RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
-    gnupg2 \
-    wget \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+RUN \
+  sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
+  && sed -i '/security.debian.org/s/^/#/' /etc/apt/sources.list \
+  && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
+  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt-get update && apt-get install -y \
     bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
+    gnupg2 \
     imagemagick \
     libbz2-dev \
     libc-client-dev \
@@ -32,7 +32,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     libzip-dev \
     libonig-dev \
     openssl \
-    postgresql-client-10 \
+    postgresql-client-11 \
     pv \
     rsync \
     ssh \

package/images/7.2-apache/Dockerfile

@@ -1,19 +1,19 @@
-# docker build -t devwithlando/php:7.2-apache-3 .
+# docker build -t devwithlando/php:7.2-apache-4 .
 
 FROM php:7.2-apache-buster
 
 # Install dependencies we need
-RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
-    gnupg2 \
-    wget \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+RUN \
+  sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
+  && sed -i '/security.debian.org/s/^/#/' /etc/apt/sources.list \
+  && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
+  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt-get update && apt-get install -y \
     bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
+    gnupg2 \
     imagemagick \
     libbz2-dev \
     libc-client-dev \
@@ -31,7 +31,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     libzip-dev \
     libonig-dev \
     openssl \
-    postgresql-client-10 \
+    postgresql-client-11 \
     pv \
     rsync \
     ssh \
@@ -45,7 +45,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && pecl install memcached \
   && pecl install oauth-2.0.2 \
   && pecl install redis-3.1.2 \
-  && pecl install xdebug \
+  && pecl install xdebug-2.9.8 \
   && docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr \
   && docker-php-ext-configure imap --with-imap-ssl --with-kerberos \
   && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \

package/images/7.2-fpm/Dockerfile

@@ -1,19 +1,19 @@
-# docker build -t devwithlando/php:7.2-fpm-3 .
+# docker build -t devwithlando/php:7.2-fpm-4 .
 
 FROM php:7.2-fpm-buster
 
 # Install dependencies we need
-RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
-    gnupg2 \
-    wget \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+RUN \
+  sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
+  && sed -i '/security.debian.org/s/^/#/' /etc/apt/sources.list \
+  && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
+  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt-get update && apt-get install -y \
     bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
+    gnupg2 \
     imagemagick \
     libbz2-dev \
     libc-client-dev \
@@ -31,7 +31,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     libzip-dev \
     libonig-dev \
     openssl \
-    postgresql-client-10 \
+    postgresql-client-11 \
     pv \
     rsync \
     ssh \
@@ -45,7 +45,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && pecl install memcached \
   && pecl install oauth-2.0.2 \
   && pecl install redis-3.1.2 \
-  && pecl install xdebug \
+  && pecl install xdebug-2.9.8 \
   && docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr \
   && docker-php-ext-configure imap --with-imap-ssl --with-kerberos \
   && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \

package/images/7.3-apache/Dockerfile

@@ -5,15 +5,11 @@ FROM php:7.3-apache-bullseye
 # Install dependencies we need
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
-    gnupg2 \
-    wget \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-  && apt-get update && apt-get install -y \
     bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
+    gnupg2 \
     imagemagick \
     libbz2-dev \
     libc-client-dev \
@@ -31,7 +27,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     libzip-dev \
     libonig-dev \
     openssl \
-    postgresql-client-10 \
+    postgresql-client-13 \
     pv \
     rsync \
     ssh \

package/images/7.3-fpm/Dockerfile

@@ -5,15 +5,11 @@ FROM php:7.3-fpm-bullseye
 # Install dependencies we need
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
-    gnupg2 \
-    wget \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-  && apt-get update && apt-get install -y \
     bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
+    gnupg2 \
     imagemagick \
     libbz2-dev \
     libc-client-dev \
@@ -31,7 +27,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     libzip-dev \
     libonig-dev \
     openssl \
-    postgresql-client-10 \
+    postgresql-client-13 \
     pv \
     rsync \
     ssh \

package/images/7.4-apache/Dockerfile

@@ -5,15 +5,11 @@ FROM php:7.4-apache-bullseye
 # Install dependencies we need
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
-    gnupg2 \
-    wget \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-  && apt-get update && apt-get install -y \
     bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
+    gnupg2 \
     imagemagick \
     libbz2-dev \
     libc-client-dev \
@@ -31,7 +27,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     libzip-dev \
     libonig-dev \
     openssl \
-    postgresql-client-10 \
+    postgresql-client-13 \
     pv \
     rsync \
     ssh \

package/images/7.4-fpm/Dockerfile

@@ -5,15 +5,11 @@ FROM php:7.4-fpm-bullseye
 # Install dependencies we need
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
-    gnupg2 \
-    wget \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-  && apt-get update && apt-get install -y \
     bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
+    gnupg2 \
     imagemagick \
     libbz2-dev \
     libc-client-dev \
@@ -31,7 +27,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     libzip-dev \
     libonig-dev \
     openssl \
-    postgresql-client-10 \
+    postgresql-client-13 \
     pv \
     rsync \
     ssh \

package/images/8.0-apache/Dockerfile

@@ -5,15 +5,11 @@ FROM php:8.0-apache-bullseye
 # Install dependencies we need
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
-    gnupg2 \
-    wget \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-  && apt-get update && apt-get install -y \
     bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
+    gnupg2 \
     imagemagick \
     libbz2-dev \
     libc-client-dev \
@@ -32,7 +28,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     libzip-dev \
     libonig-dev \
     openssl \
-    postgresql-client-10 \
+    postgresql-client-13 \
     pv \
     rsync \
     ssh \

package/images/8.0-fpm/Dockerfile

@@ -5,15 +5,11 @@ FROM php:8.0-fpm-bullseye
 # Install dependencies we need
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
-    gnupg2 \
-    wget \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-  && apt-get update && apt-get install -y \
     bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
+    gnupg2 \
     imagemagick \
     libbz2-dev \
     libc-client-dev \
@@ -32,7 +28,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     libzip-dev \
     libonig-dev \
     openssl \
-    postgresql-client-10 \
+    postgresql-client-13 \
     pv \
     rsync \
     ssh \

package/images/8.1-apache/Dockerfile

@@ -5,15 +5,11 @@ FROM php:8.1-apache-bullseye
 # Install dependencies we need
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
-    gnupg2 \
-    wget \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-  && apt-get update && apt-get install -y \
     bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
+    gnupg2 \
     imagemagick \
     libbz2-dev \
     libc-client-dev \
@@ -32,7 +28,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     libzip-dev \
     libonig-dev \
     openssl \
-    postgresql-client-10 \
+    postgresql-client-13 \
     pv \
     rsync \
     ssh \

package/images/8.1-fpm/Dockerfile

@@ -5,15 +5,11 @@ FROM php:8.1-fpm-bullseye
 # Install dependencies we need
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
-    gnupg2 \
-    wget \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
-  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-  && apt-get update && apt-get install -y \
     bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
+    gnupg2 \
     imagemagick \
     libbz2-dev \
     libc-client-dev \
@@ -32,7 +28,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     libzip-dev \
     libonig-dev \
     openssl \
-    postgresql-client-10 \
+    postgresql-client-13 \
     pv \
     rsync \
     ssh \