@lando/php 1.6.1 → 1.6.3

package/.eslintrc.json

@@ -1,7 +1,8 @@
 {
   "env": {
     "node": true,
-    "mocha": true
+    "mocha": true,
+    "es2021": true
   },
   "parser": "@babel/eslint-parser",
   "parserOptions": {
@@ -9,15 +10,27 @@
     "ecmaVersion": 8,
     "requireConfigFile": false
   },
-  "extends": "google",
+  "extends": [
+    "eslint:recommended",
+    "google"
+  ],
   "rules": {
     "arrow-parens": ["error",
       "as-needed"
     ],
     "max-len": ["error", {
-      "code": 120,
+      "code": 140,
       "ignoreComments": true
     }],
+    "no-empty": ["error", {
+      "allowEmptyCatch": true
+    }],
+    "no-unused-vars": ["error", {
+      "vars": "all",
+      "args": "after-used",
+      "ignoreRestSiblings": false
+    }],
+
     "require-jsdoc": ["error", {
       "require": {
         "FunctionDeclaration": true,

package/.node-version

@@ -1 +1 @@
-18
+20

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.6.3 - [December 7, 2024](https://github.com/lando/php/releases/tag/v1.6.3)
+
+* Optimized for `midcore`
+
+## v1.6.2 - [December 6, 2024](https://github.com/lando/php/releases/tag/v1.6.2)
+
+* Updated the version index.md to get Docuverse page to build correctly.
+
+* Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.24](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.24).
+* Updated GitHub Actions to build images only on changes to images or workflows.
+
 ## v1.6.1 - [November 4, 2024](https://github.com/lando/php/releases/tag/v1.6.1)
 
 * Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.18](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.18).

package/builders/php-nginx.js

@@ -7,9 +7,9 @@ const LandoNginx = require('@lando/nginx/builders/nginx.js');
 module.exports = {
   name: 'php-nginx',
   parent: '_webserver',
-  builder: (parent, config) => class PhpNginx extends LandoNginx.builder(parent, LandoNginx.config) {
+  builder: parent => class PhpNginx extends LandoNginx.builder(parent, LandoNginx.config) {
     constructor(id, options = {}) {
       super(id, options, {services: _.set({}, options.name)});
-    };
+    }
   },
 };

package/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'],
@@ -215,6 +215,6 @@ module.exports = {
       // Add in the php service and push downstream
       options.sources.push({services: _.set({}, options.name, php)});
       super(id, options, ..._.flatten(options.sources));
-    };
+    }
   },
 };

package/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
 

package/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
 

package/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
 

package/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
 

package/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
 

package/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
 

package/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
 

package/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
 

package/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
 

package/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
 

package/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
 

package/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
 

package/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
 

package/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
 

package/images/8.1-apache/Dockerfile

@@ -1,81 +1,56 @@
-# 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 imagick \
+  && 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/*

package/images/8.1-fpm/Dockerfile

@@ -1,82 +1,56 @@
-# docker build -t devwithlando/php:8.1-fpm-4 .
+# docker build -t devwithlando/php:8.1-fpm-5 .
 
-FROM php:8.1-fpm-bullseye
+FROM php:8.1-fpm-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 imagick \
+  && 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
-
-# Tests
-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/*

package/images/8.2-apache/Dockerfile

@@ -1,81 +1,56 @@
-# docker build -t devwithlando/php:8.2-apache-4 .
+# docker build -t devwithlando/php:8.2-apache-5 .
 
-FROM php:8.2-apache-bullseye
+FROM php:8.2-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.18 \
-  && 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 imagick \
+  && 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/*