@lando/drupal 1.7.0 → 1.9.0

package/node_modules/@lando/php/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/node_modules/@lando/php/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/node_modules/@lando/php/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/node_modules/@lando/php/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/node_modules/@lando/php/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 \

package/node_modules/@lando/php/images/8.2-apache/Dockerfile

@@ -5,15 +5,11 @@ FROM php:8.2-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/node_modules/@lando/php/images/8.2-fpm/Dockerfile

@@ -5,15 +5,11 @@ FROM php:8.2-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/node_modules/@lando/php/images/8.3-apache/Dockerfile

@@ -4,16 +4,12 @@ FROM php:8.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 \
@@ -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/node_modules/@lando/php/images/8.3-fpm/Dockerfile

@@ -4,16 +4,12 @@ FROM php:8.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 \
@@ -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/node_modules/@lando/php/images/8.4-apache/Dockerfile

@@ -0,0 +1,56 @@
+# docker build -t devwithlando/php:8.4-apache-4 .
+
+FROM php:8.4.0RC2-apache-bookworm
+
+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 \
+    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/*

package/node_modules/@lando/php/images/8.4-fpm/Dockerfile

@@ -0,0 +1,56 @@
+# docker build -t devwithlando/php:8.4-fpm-4 .
+
+FROM php:8.4.0RC2-fpm-bookworm
+
+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 \
+    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/*

package/node_modules/@lando/php/netlify.toml

@@ -1,8 +1,19 @@
 [build]
   base = "./"
   publish = "docs/.vitepress/dist"
+  command = "npm run docs:mvb"
+
+[context.deploy-preview]
   command = "npm run docs:build"
 
+# https://github.com/munter/netlify-plugin-checklinks#readme
+[[context.deploy-preview.plugins]]
+  package = "netlify-plugin-checklinks"
+  [context.deploy-preview.plugins.inputs]
+    todoPatterns = [ "load", "CHANGELOG.html", "x.com", "twitter.com", "/v/" ]
+    skipPatterns = [ ".rss", ".gif", ".jpg" ]
+    checkExternal = true
+
 # Sets our asset optimization
 [build.processing.css]
   bundle = true
@@ -28,14 +39,6 @@
   [plugins.inputs.audits]
     output_path = "reports/lighthouse.html"
 
-# https://github.com/munter/netlify-plugin-checklinks#readme
-[[plugins]]
-  package = "netlify-plugin-checklinks"
-  [plugins.inputs]
-    todoPatterns = [ "load", "CHANGELOG.html", "x.com", "twitter.com" ]
-    skipPatterns = [ ".rss", ".gif", ".jpg" ]
-    checkExternal = true
-
 # We need this so preview environments and the base site look ok on their own
 [[redirects]]
   from = "/"
@@ -44,4 +47,4 @@
 [[redirects]]
   from = "/plugins/php/*"
   to = "/:splat"
-  status = 200
+  status = 200

package/node_modules/@lando/php/node_modules/@lando/nginx/.eslintignore

@@ -1,4 +1,5 @@
-.temp
-.cache
+temp
+cache
 dist
 _site
+!.vitepress

package/node_modules/@lando/php/node_modules/@lando/nginx/.lando.yml

@@ -1,14 +1,24 @@
-name: lando-nginx-plugin
+name: docs.nginx
+proxy:
+  cli:
+    - docs.nginx.lndo.site:5173
 services:
-  node:
-    type: node:16
-    build:
-      - yarn 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
-  yarn:
-    service: node
+    service: cli
+  npm:
+    service: cli
+  vitepress:
+    service: cli
+    cmd: npx vitepress

package/node_modules/@lando/php/node_modules/@lando/nginx/.node-version

@@ -1 +1 @@
-16
+18

package/node_modules/@lando/php/node_modules/@lando/nginx/CHANGELOG.md

@@ -1,37 +1,58 @@
+## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
+
+## v1.3.0 - [October 16, 2024](https://github.com/lando/nginx/releases/tag/v1.3.0)
+
+* Added nginx 1.27
+* Updated other versions to latest bitnami images
+* Minor curl improvements
+
+## v1.2.0 - [June 11, 2024](https://github.com/lando/nginx/releases/tag/v1.2.0)
+
+* Added support for `nginx:1.26`.
+* Changed default version to `1.26`
+
+## v1.1.0 - [March 8, 2024](https://github.com/lando/nginx/releases/tag/v1.1.0)
+  * Updated to latest database services.
+
+## v1.0.0 - [December 7, 2023](https://github.com/lando/ngin/releases/tag/v1.0.0)
+
+* Changed default version to `1.25`
+* Dialed fully for `lando update`
+* Re-added `render-template` tooling as possible
+* Removed support for `nginx:1.14`
+
 ## v0.11.0 - [December 5, 2023](https://github.com/lando/nginx/releases/tag/v0.11.0)
 
-  * Got rid of render-template tooling. [#33](https://github.com/lando/nginx/pull/33)
-  * Added support for `nginx:1.25`.
+* Got rid of `render-template` tooling [#33](https://github.com/lando/nginx/pull/33)
+* Added support for `nginx:1.25`.
 
 ## v0.10.0 - [November 15, 2023](https://github.com/lando/nginx/releases/tag/v0.10.0)
 
-  * Moved builder file to the new builders/ directory.
-  * Isolated testing to fit with HARDCORE strategy.
+* Moved builder file to the new builders/ directory.
+* Isolated testing to fit with HARDCORE strategy.
 
 ## v0.9.0 - [July 3, 2023](https://github.com/lando/nginx/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 - [May 10, 2023](https://github.com/lando/nginx/releases/tag/v0.8.0)
 
-  * Added support for `nginx:1.19`
-  * Added support for `nginx:1.20`
-  * Added support for `nginx:1.21`
-  * Added support for `nginx:1.22`
-  * Added support for `nginx:1.23`
-  * Added support for `nginx:1.24`
+* Added support for `nginx:1.19`
+* Added support for `nginx:1.20`
+* Added support for `nginx:1.21`
+* Added support for `nginx:1.22`
+* Added support for `nginx:1.23`
+* Added support for `nginx:1.24`
 
 ## v0.7.0 - [December 12, 2022](https://github.com/lando/nginx/releases/tag/v0.7.0)
 
-  * Added bundle-dependencies to release process.
-  * Fixed bug in plugin dogfooding test.
-
-## v0.6.0 - [September 7, 2022](https://github.com/lando/nginx/releases/tag/v0.6.0)
+* Added bundle-dependencies to release process.
+* Fixed bug in plugin dogfooding test.
 
 ## v0.5.0 - [November 9, 2021](https://github.com/lando/nginx/releases/tag/v0.5.0)
 
-  Lando is **free** and **open source** software that relies on contributions from developers like you! If you like Lando then help us spend more time making, updating and supporting it by [contributing](https://github.com/sponsors/lando).
+Lando is **free** and **open source** software that relies on contributions from developers like you! If you like Lando then help us spend more time making, updating and supporting it by [contributing](https://github.com/sponsors/lando).
 
-  * Initial Release
+* Initial Release

package/node_modules/@lando/php/node_modules/@lando/nginx/README.md

@@ -33,6 +33,12 @@ 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/nginx/blob/main/CHANGELOG.md) and the [release notes](https://github.com/lando/nginx/releases).
 
+
+## Maintainers
+
+* [@pirog](https://github.com/pirog)
+* [@reynoldsalec](https://github.com/reynoldsalec)
+
 ## Contributors
 
 <a href="https://github.com/lando/nginx/graphs/contributors">

package/node_modules/@lando/php/node_modules/@lando/nginx/builders/nginx.js

@@ -8,12 +8,13 @@ const path = require('path');
 module.exports = {
   name: 'nginx',
   config: {
-    version: '1.17',
-    supported: ['1.14', '1.16', '1.17', '1.18', '1.19', '1.20', '1.21', '1.22', '1.23', '1.24', '1.25'],
-    legacy: ['1.14'],
+    version: '1.27',
+    supported: ['1.16', '1.17', '1.18', '1.19', '1.20', '1.21', '1.22', '1.23', '1.24', '1.25', '1.26', '1.27'],
     pinPairs: {
-      '1.25': 'bitnami/nginx:1.25.3-debian-11-r1',
-      '1.24': 'bitnami/nginx:1.24.0-debian-11-r153',
+      '1.27': 'bitnami/nginx:1.27.2-debian-12-r0',
+      '1.26': 'bitnami/nginx:1.26.2-debian-12-r6',
+      '1.25': 'bitnami/nginx:1.25.5-debian-12-r7',
+      '1.24': 'bitnami/nginx:1.24.0-debian-12-r25',
       '1.23': 'bitnami/nginx:1.23.4-debian-11-r24',
       '1.22': 'bitnami/nginx:1.22.1-debian-11-r66',
       '1.21': 'bitnami/nginx:1.21.6-debian-11-r21',
@@ -22,7 +23,6 @@ module.exports = {
       '1.18': 'bitnami/nginx:1.18.0-debian-10-r363',
       '1.17': 'bitnami/nginx:1.17.10-debian-10-r71',
       '1.16': 'bitnami/nginx:1.16.1-debian-10-r106',
-      '1.14': 'bitnami/nginx:1.14.2-r125',
     },
     patchesSupported: true,
     confSrc: path.resolve(__dirname, '..', 'config'),
@@ -41,6 +41,8 @@ module.exports = {
       server: '/tmp/server.conf.lando',
       vhosts: '/tmp/vhosts.conf.lando',
     },
+    renderArch: 'amd64',
+    renderTemplate: '1.0.6',
     ssl: false,
     webroot: '.',
   },
@@ -48,21 +50,18 @@ module.exports = {
   builder: (parent, config) => class LandoNginx extends parent {
     constructor(id, options = {}) {
       options = _.merge({}, config, options);
-
-      // compute the minor version
-      const mv = _(options.version.split('.')).thru(versions => [versions[0], versions[1]].join('.')).value();
-
+      // Are we strapped?
+      if (_.get(options, '_app._config.isArmed', false)) options.renderArch = 'arm64';
       // Use different default for ssl
       if (options.ssl) options.defaultFiles.vhosts = 'default-ssl.conf.tpl';
 
-      // If we are using the older 1.14 version we need different locations
-      if (mv === '1.14') {
-        options.finalFiles = _.merge({}, options.finalFiles, {
-          server: '/opt/bitnami/extra/nginx/templates/nginx.conf.tpl',
-          vhosts: '/opt/bitnami/extra/nginx/templates/default.conf.tpl',
-        });
-        options.defaultFiles = _.merge({}, options.defaultFiles, {server: 'nginx.conf.tpl'});
-      }
+      // attempt to install the render-template
+      require('../utils/add-build-step')(
+        [`/helpers/install-render-template.sh ${options.renderTemplate} ${options.renderArch}`],
+        options._app,
+        options.name,
+        'build_as_root_internal',
+      );
 
       // Get the config files final destination
       // @TODO: we cp the files instead of directly mounting them to

package/node_modules/@lando/php/node_modules/@lando/nginx/config/launch.sh

@@ -35,8 +35,14 @@ if [ -f "$PARAMS_SOURCE" ]; then
 fi
 
 # Replace LANDO_WEBROOT in the vhost template
-lando_info "Using sed to place correct webroot in vhost template"
-sed 's@{{LANDO_WEBROOT}}@'"${LANDO_WEBROOT}"'@g' "$VHOST_SOURCE" > /opt/bitnami/nginx/conf/vhosts/lando.conf
+# Render the template if render-template exists
+if [ -x "$(command -v render-template)" ]; then
+  render-template "$VHOST_SOURCE" > /opt/bitnami/nginx/conf/vhosts/lando.conf
+else
+  lando_warn "Command render-template not found, using sed fallback"
+  lando_warn "If your template replaced more than LANDO_WEBROOT this is probably going to be an issue"
+  sed 's@{{LANDO_WEBROOT}}@'"${LANDO_WEBROOT}"'@g' "$VHOST_SOURCE" > /opt/bitnami/nginx/conf/vhosts/lando.conf
+fi
 
 lando_info "Rendered template /tmp/vhosts.lando to /opt/bitnami/nginx/conf/vhosts/lando.conf"
 lando_debug $(cat /opt/bitnami/nginx/conf/vhosts/lando.conf)