Add 8.3 php fpm image. (#221)

* Add 8.3 php fpm image.

* Add upstream lando yml to dogfood plugin in tests.

* Correct init location.

* Update changelog.

* Add php 8.3 to list of gen4 php versions.

* Test for php 8.3 on drupal10.

.github/workflows/build-pantheon-images.yml

@@ -18,37 +18,40 @@ jobs:
         include:
           - image: pantheon-index
             tag: 3.6-3
-            context: recipes/pantheon/3.6-solr
+            context: dockerfiles/3.6-solr
           - image: pantheon-index
             tag: 8.8-4
-            context: recipes/pantheon/8.8-solr
+            context: dockerfiles/8.8-solr
+          - image: pantheon-appserver
+            tag: 8.3-4
+            context: dockerfiles/8.3-fpm
           - image: pantheon-appserver
             tag: 8.2-4
-            context: recipes/pantheon/8.2-fpm
+            context: dockerfiles/8.2-fpm
           - image: pantheon-appserver
             tag: 8.1-4
-            context: recipes/pantheon/8.1-fpm
+            context: dockerfiles/8.1-fpm
           - image: pantheon-appserver
             tag: 8.0-4
-            context: recipes/pantheon/8.0-fpm
+            context: dockerfiles/8.0-fpm
           - image: pantheon-appserver
             tag: 7.4-4
-            context: recipes/pantheon/7.4-fpm
+            context: dockerfiles/7.4-fpm
           - image: pantheon-appserver
             tag: 7.3-4
-            context: recipes/pantheon/7.3-fpm
+            context: dockerfiles/7.3-fpm
           - image: pantheon-appserver
             tag: 7.2-3
-            context: recipes/pantheon/7.2-fpm
+            context: dockerfiles/7.2-fpm
           - image: pantheon-appserver
             tag: 7.1-3
-            context: recipes/pantheon/7.1-fpm
+            context: dockerfiles/7.1-fpm
           - image: pantheon-appserver
             tag: 7.0-3
-            context: recipes/pantheon/7.0-fpm
+            context: dockerfiles/7.0-fpm
           - image: pantheon-appserver
             tag: 5.6-3
-            context: recipes/pantheon/5.6-fpm
+            context: dockerfiles/5.6-fpm
 
     steps:
       - name: Checkout code

CHANGELOG.md

@@ -1,13 +1,20 @@
-## v1.1.0 - [February 29, 2024](https://github.com/lando/pantheon/releases/tag/v1.1.0)
+## v1.1.0 - [March 4, 2024](https://github.com/lando/pantheon/releases/tag/v1.1.0)
 
 ### New Features
 
-* Added support for `php:8.3` [#39](https://github.com/lando/wordpress/issues/39)
-* Added support for `php:8.2` [#39](https://github.com/lando/wordpress/issues/39)
+* Added support for `php:8.3`
+* Added support for `php:8.2`
+
+### Fixes
+
+* Fixed deprecation notices from Terminus for some versions of PHP [#168](https://github.com/lando/pantheon/issues/168)
 
 ### Internal
 
 * Updated to `@lando/php@1.2.0`
+* Updated config loading to respect Lando's config settings.
+* Added some config test coverage.
+* Added drupal10 test coverage.
 
 ## v1.0.1 - [January 8, 2024](https://github.com/lando/pantheon/releases/tag/v1.0.1)
 

builders/pantheon-php.js

@@ -25,7 +25,7 @@ module.exports = {
   parent: '_appserver',
   config: {
     gen3: ['7.2', '7.1', '7.0', '5.6'],
-    gen4: ['8.2', '8.1', '8.0', '7.4', '7.3'],
+    gen4: ['8.3', '8.2', '8.1', '8.0', '7.4', '7.3'],
   },
   builder: (parent, config) => class PantheonPhp extends LandoPhp.builder(parent, LandoPhp.config) {
     constructor(id, options = {}, factory) {

recipes/pantheon/8.0-fpm/Dockerfile → dockerfiles/8.0-fpm/Dockerfile

@@ -6,7 +6,7 @@ FROM devwithlando/php:8.0-fpm-4
 ENV WKHTMLTOPDF_VERSION 0.12.6
 ENV PHANTOMJS_VERSION 2.1.1
 ENV PHANTOMJS_OLD_VERSION 1.7.0
-ENV LANDO_TERMINUS_VERSION 3.0.7
+ENV LANDO_TERMINUS_VERSION 3.3.5
 ENV TIKA_VERSION 1.18
 
 # Install the additional things that make the pantheon

recipes/pantheon/8.1-fpm/Dockerfile → dockerfiles/8.1-fpm/Dockerfile

@@ -6,7 +6,7 @@ FROM devwithlando/php:8.1-fpm-4
 ENV WKHTMLTOPDF_VERSION 0.12.6
 ENV PHANTOMJS_VERSION 2.1.1
 ENV PHANTOMJS_OLD_VERSION 1.7.0
-ENV LANDO_TERMINUS_VERSION 3.0.7
+ENV LANDO_TERMINUS_VERSION 3.3.5
 ENV TIKA_VERSION 1.18
 
 # Install the additional things that make the pantheon

recipes/pantheon/8.2-fpm/Dockerfile → dockerfiles/8.2-fpm/Dockerfile

@@ -6,7 +6,7 @@ FROM devwithlando/php:8.2-fpm-4
 ENV WKHTMLTOPDF_VERSION 0.12.6
 ENV PHANTOMJS_VERSION 2.1.1
 ENV PHANTOMJS_OLD_VERSION 1.7.0
-ENV LANDO_TERMINUS_VERSION 3.1.4
+ENV LANDO_TERMINUS_VERSION 3.3.5
 ENV TIKA_VERSION 1.18
 
 # Install the additional things that make the pantheon

dockerfiles/8.3-fpm/Dockerfile

@@ -0,0 +1,52 @@
+# docker build -t devwithlando/pantheon-appserver:8.3-4 .
+
+FROM devwithlando/php:8.3-fpm-4
+
+# Version information
+ENV WKHTMLTOPDF_VERSION 0.12.6
+ENV PHANTOMJS_VERSION 2.1.1
+ENV PHANTOMJS_OLD_VERSION 1.7.0
+ENV LANDO_TERMINUS_VERSION 3.3.5
+ENV TIKA_VERSION 1.18
+
+# Install the additional things that make the pantheon
+RUN mkdir -p /usr/share/man/man1 \
+  && apt-get update && apt-get install -y \
+    openjdk-11-jdk gdebi \
+  && rm -f /usr/local/etc/php/conf.d/*-memcached.ini \
+  && mkdir -p /var/www/.drush \
+  && mkdir -p /var/www/.backdrush \
+  && mkdir -p /var/www/.composer \
+  && mkdir -p /var/www/.drupal \
+  && mkdir -p /srv/bin \
+  && chown -R www-data:www-data /var/www /srv/bin \
+  && wget "https://github.com/pantheon-systems/terminus/releases/download/${LANDO_TERMINUS_VERSION}/terminus.phar" -O /usr/local/bin/terminus \
+  && chmod +x /usr/local/bin/terminus \
+  && uname -m \
+  && cd /tmp && wget "https://github.com/wkhtmltopdf/packaging/releases/download/${WKHTMLTOPDF_VERSION}-1/wkhtmltox_${WKHTMLTOPDF_VERSION}-1.buster_amd64.deb" \
+  && cd /tmp && wget "https://github.com/wkhtmltopdf/packaging/releases/download/${WKHTMLTOPDF_VERSION}-1/wkhtmltox_${WKHTMLTOPDF_VERSION}-1.buster_arm64.deb" \
+  && /bin/bash -c 'if [[ "$(uname -m)" == "x86_64" ]]; then dpkg -i "/tmp/wkhtmltox_${WKHTMLTOPDF_VERSION}-1.buster_amd64.deb"; fi' \
+  && /bin/bash -c 'if [[ "$(uname -m)" == "aarch64" ]]; then dpkg -i "/tmp/wkhtmltox_${WKHTMLTOPDF_VERSION}-1.buster_arm64.deb"; fi' \
+  && apt-get install -yf \
+  && ln -sf /usr/local/bin/wkhtmltopdf /srv/bin/wkhtmltopdf \
+  && cd /tmp && curl -fsSL "https://github.com/Medium/phantomjs/releases/download/v${PHANTOMJS_VERSION}/phantomjs-${PHANTOMJS_VERSION}-linux-x86_64.tar.bz2" | tar -xjv \
+  && mv phantomjs-${PHANTOMJS_VERSION}-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs-${PHANTOMJS_VERSION}-amd64 \
+  && chmod +x /usr/local/bin/phantomjs-${PHANTOMJS_VERSION}-amd64 \
+  && cd /tmp && wget "https://github.com/fg2it/phantomjs-on-raspberry/releases/download/v${PHANTOMJS_VERSION}-jessie-stretch-arm64/phantomjs" \
+  && mv phantomjs /usr/local/bin/phantomjs-${PHANTOMJS_VERSION}-arm64 \
+  && chmod +x /usr/local/bin/phantomjs-${PHANTOMJS_VERSION}-arm64 \
+  && /bin/bash -c 'if [[ "$(uname -m)" == "x86_64" ]]; then ln -sf /usr/local/bin/phantomjs-${PHANTOMJS_VERSION}-amd64 /srv/bin/phantomjs-${PHANTOMJS_VERSION}; fi' \
+  && /bin/bash -c 'if [[ "$(uname -m)" == "aarch64" ]]; then ln -sf /usr/local/bin/phantomjs-${PHANTOMJS_VERSION}-arm64 /srv/bin/phantomjs-${PHANTOMJS_VERSION}; fi' \
+  && ls -lsa /usr/local/bin \
+  && cd /tmp && curl -fsSL "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/phantomjs/phantomjs-${PHANTOMJS_OLD_VERSION}-linux-x86_64.tar.bz2" | tar -xjv \
+  && mv phantomjs-${PHANTOMJS_OLD_VERSION}-linux-x86_64/bin/phantomjs /srv/bin/phantomjs \
+  && chmod +x /srv/bin/phantomjs \
+  && /bin/bash -c 'if [[ "$(uname -m)" == "aarch64" ]]; then ln -sf /usr/local/bin/phantomjs-${PHANTOMJS_VERSION}-arm64 /srv/bin/phantomjs; fi' \
+  && wget "http://archive.apache.org/dist/tika/tika-app-${TIKA_VERSION}.jar" -O /srv/bin/tika-app-${TIKA_VERSION}.jar \
+  && chmod +x /srv/bin/tika-app-${TIKA_VERSION}.jar \
+  && wget "http://archive.apache.org/dist/tika/tika-app-1.1.jar" -O /srv/bin/tika-app-1.1.jar \
+  && chmod +x /srv/bin/tika-app-1.1.jar \
+  && 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/*

examples/drupal10/README.md

@@ -18,8 +18,8 @@ lando poweroff
 
 # Should initialize the lando pantheon test drupal10 site
 rm -rf drupal10 && mkdir -p drupal10 && cd drupal10
-lando init --source pantheon --pantheon-auth "$PANTHEON_MACHINE_TOKEN" --pantheon-site landobot-drupal10
 cp ../../.lando.upstream.yml .lando.upstream.yml
+lando init --source pantheon --pantheon-auth "$PANTHEON_MACHINE_TOKEN" --pantheon-site landobot-drupal10
 
 # Should start up our drupal10 site successfully
 cd drupal10
@@ -83,9 +83,9 @@ lando ssh -c "env" | grep TERMINUS_ENV | grep dev
 lando ssh -c "env" | grep TERMINUS_SITE | grep landobot-drupal10
 lando ssh -c "env" | grep TERMINUS_USER | grep droid@lando.dev
 
-# Should use php version in pantheon.upstream.yml
+# Should use php version in pantheon.yml
 cd drupal10
-lando php -v | grep "PHP 8.2"
+lando php -v | grep "PHP 8.3"
 
 # Should use the database version in pantheon.yml
 cd drupal10

examples/drupal7/README.md

@@ -18,6 +18,7 @@ lando poweroff
 
 # Should initialize the lando pantheon test drupal7 site
 rm -rf drupal7 && mkdir -p drupal7 && cd drupal7
+cp ../../.lando.upstream.yml .lando.upstream.yml
 lando init --source pantheon --pantheon-auth "$PANTHEON_MACHINE_TOKEN" --pantheon-site landobot-drupal7
 
 # Should start up our drupal7 site successfully

examples/drupal8/README.md

@@ -18,6 +18,7 @@ lando poweroff
 
 # Should initialize the lando pantheon test drupal8 site
 rm -rf drupal8 && mkdir -p drupal8 && cd drupal8
+cp ../../.lando.upstream.yml .lando.upstream.yml
 lando init --source pantheon --pantheon-auth "$PANTHEON_MACHINE_TOKEN" --pantheon-site landobot-drupal8 --option composer_version=1.10.1
 
 # Should start up our drupal8 site successfully

examples/drupal9/README.md

@@ -18,6 +18,7 @@ lando poweroff
 
 # Should initialize the lando pantheon test drupal9 site
 rm -rf drupal9 && mkdir -p drupal9 && cd drupal9
+cp ../../.lando.upstream.yml .lando.upstream.yml
 lando init --source pantheon --pantheon-auth "$PANTHEON_MACHINE_TOKEN" --pantheon-site landobot-drupal9
 
 # Should start up our drupal9 site successfully

examples/init/README.md

@@ -20,6 +20,7 @@ lando poweroff
 rm -rf drupal9
 git clone https://github.com/lando/pantheon-gitpod.git drupal9
 cd drupal9
+cp ../../.lando.upstream.yml .lando.upstream.yml
 lando init --source cwd --recipe pantheon --pantheon-auth "$PANTHEON_MACHINE_TOKEN" --pantheon-site landobot-drupal9
 
 # Should start up our drupal9 site successfully

examples/wordpress/README.md

@@ -18,6 +18,7 @@ lando poweroff
 
 # Should initialize the lando pantheon test wordpress site
 rm -rf wordpress && mkdir -p wordpress && cd wordpress
+cp ../../.lando.upstream.yml .lando.upstream.yml
 lando init --source pantheon --pantheon-auth "$PANTHEON_MACHINE_TOKEN" --pantheon-site landobot-wordpress --option composer_version=1.10.1
 
 # Should start up our wordpress site successfully

examples/wordpressnetworkdomain/README.md

@@ -18,6 +18,7 @@ lando poweroff
 
 # Should initialize the lando pantheon test wordpress site
 rm -rf wordpress && mkdir -p wordpress && cd wordpress
+cp ../../.lando.upstream.yml .lando.upstream.yml
 lando init --source pantheon --pantheon-auth "$PANTHEON_MACHINE_TOKEN" --pantheon-site landobot-network-domain
 
 # Should start up our wordpress site successfully

examples/wordpressnetworkfolder/README.md

@@ -18,6 +18,7 @@ lando poweroff
 
 # Should initialize the lando pantheon test wordpress site
 rm -rf wordpress && mkdir -p wordpress && cd wordpress
+cp ../../.lando.upstream.yml .lando.upstream.yml
 lando init --source pantheon --pantheon-auth "$PANTHEON_MACHINE_TOKEN" --pantheon-site landobot-network-folder
 
 # Should start up our wordpress site successfully

recipes/pantheon/init.js → inits/pantheon.js

@@ -4,8 +4,8 @@
 const _ = require('lodash');
 const os = require('os');
 const path = require('path');
-const PantheonApiClient = require('./../../lib/client');
-const utils = require('./../../lib/utils');
+const PantheonApiClient = require('./../lib/client');
+const utils = require('./../lib/utils');
 const url = require('url');
 const fs = require('fs');