@lando/php 1.3.0 → 1.4.0

package/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/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/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/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/netlify.toml

@@ -1,8 +1,21 @@
 [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,13 +41,7 @@
   [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]]
@@ -44,4 +51,4 @@
 [[redirects]]
   from = "/plugins/php/*"
   to = "/:splat"
-  status = 200
+  status = 200

package/node_modules/@lando/nginx/.eslintignore

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

package/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/nginx/.node-version

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

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

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

@@ -1,7 +1,20 @@
 [build]
   base = "./"
-  publish = "docs/.vuepress/dist"
-  command = "yarn docs:build"
+  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]
@@ -20,13 +33,22 @@
   for = "/images/*"
   [headers.values]
     Cache-Control = "public, max-age=31536000"
-	  
+
+# pluginz
+# https://github.com/netlify/netlify-plugin-lighthouse#readme
+[[plugins]]
+  package = "@netlify/plugin-lighthouse"
+  [plugins.inputs.audits]
+    output_path = "reports/lighthouse.html"
+
+
+
 # We need this so preview environments and the base site look ok on their own
 [[redirects]]
   from = "/"
-  to = "/nginx"
+  to = "/plugins/nginx"
   status = 200
 [[redirects]]
-  from = "/nginx/*"
+  from = "/plugins/nginx/*"
   to = "/:splat"
-  status = 200
+  status = 200

package/node_modules/@lando/nginx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/nginx",
   "description": "A Lando plugin that provides a tight integration with NGINX.",
-  "version": "0.11.0",
+  "version": "1.3.0",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/nginx",
@@ -14,11 +14,8 @@
     "nginx"
   ],
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
-  "bundledDependencies": [
-    "lodash"
-  ],
   "lando": {},
   "main": "index.js",
   "nyc": {
@@ -36,21 +33,22 @@
   },
   "scripts": {
     "coverage": "nyc report --reporter=text-lcov | coveralls",
-    "docs:dev": "vuepress dev docs --clean-cache --clean-temp",
-    "docs:build": "vuepress build docs",
-    "docs:lint": "eslint -c docs/.eslintrc.json --quiet docs/.vuepress",
-    "lint": "eslint --quiet . && yarn docs:lint",
+    "docs:build": "LANDO_MVB_VERSION=$(git describe --tags --always --abbrev=1 --match=\"v[0-9].*\") vitepress build docs",
+    "docs:dev": "LANDO_MVB_VERSION=$(git describe --tags --always --abbrev=1 --match=\"v[0-9].*\") vitepress dev docs",
+    "docs:mvb": "npx mvb docs",
+    "docs:preview": "vitepress preview docs",
+    "lint": "eslint . --ext .js --ext .mjs ",
     "test:unit": "nyc --reporter=html --reporter=text mocha --timeout 5000 test/**/*.spec.js",
-    "test:leia": "yarn leia \"examples/**/README.md\" -c 'Destroy tests' --stdin",
-    "test": "yarn lint && yarn test:unit"
+    "test:leia": "leia \"examples/**/README.md\" -c 'Destroy tests' --stdin",
+    "test": "npm run lint && npm run test:unit"
   },
   "dependencies": {
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.0",
-    "@lando/leia": "^0.6.5",
-    "@lando/vuepress-theme-default-plus": "1.0.0-beta.49",
+    "@lando/leia": "^1.0.0-beta.3",
+    "@lando/vitepress-theme-default-plus": "^1.1.0-beta.14",
     "chai": "^4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^7.32.0",
@@ -58,6 +56,15 @@
     "eslint-plugin-vue": "^8.0.3",
     "mocha": "^9.1.2",
     "nyc": "^15.1.0",
-    "vuepress": "2.0.0-beta.53"
+    "vitepress": "^1.3.4"
+  },
+  "bundledDependencies": [
+    "lodash"
+  ],
+  "dist": {
+    "integrity": "sha512-UTLWYmYRyUHpPa6vJSKgn9Xn0pxAM05VoUaH1TZR/P1oU+pXbCQ2Py5PgoSww91VdCyGTtHAptPGFOSMFzKNBA==",
+    "shasum": "52ea3ff458ea8d90e4e0c4fa45786a1149276168",
+    "filename": "@lando/nginx-1.3.0.tgz",
+    "unpackedSize": 1480364
   }
 }

package/node_modules/@lando/nginx/scripts/install-render-template.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# allow this to run through without failing
+# set -e
+
+# args
+version="${1:-"1.0.6"}"
+# @TODO: swtich back to amd64?
+arch="${2:-"arm64"}"
+
+# if we have render-template then just exit
+if [ "$(command -v render-template)" ]; then exit 0; fi
+
+# computed
+url="https://github.com/bitnami/render-template/releases/download/v${version}/render-template-linux-${arch}.tar.gz"
+tmpdir="/tmp/render-template-${version}"
+
+# prep
+rm -rf "$tmpdir" && mkdir -p "$tmpdir"
+mkdir -p /usr/local/bin
+
+# there are different considerations around 1.0.0
+if [ "$version" == "1.0.0" ] && [ "$arch" == "arm64" ]; then
+  curl -fsSL \
+    -o "${tmpdir}/render-template-linux-${arch}" \
+    "https://github.com/bitnami/render-template/releases/download/v1.0/render-template-arm64"
+
+# amd situation
+elif [ "$version" == "1.0.0" ] && [ "$arch" == "amd64" ]; then
+  curl -fsSL \
+    -o "${tmpdir}/render-template-linux-${arch}.zip" \
+    "https://github.com/bitnami/render-template/releases/download/v1.0/render-template.zip"
+  unzip "${tmpdir}/render-template-linux-${arch}.zip" -d "${tmpdir}"
+  mv "${tmpdir}/render-template" "${tmpdir}/render-template-linux-${arch}"
+
+# everything else can go here though
+else
+  curl -fsSL "$url" | tar -xz -C "$tmpdir"
+fi
+
+# mv & execute
+mv "${tmpdir}/render-template-linux-${arch}" /usr/local/bin/render-template
+chmod +x /usr/local/bin/render-template
+
+# allows return fine
+# this isnt great but is probably good enough to last us until the lando 4 config generator
+exit 0

package/node_modules/@lando/nginx/utils/add-build-step.js

@@ -0,0 +1,14 @@
+'use strict';
+
+// Modules
+const _ = require('lodash');
+
+/*
+ * Helper to get global deps
+ * @TODO: this looks pretty testable? should services have libs?
+ */
+module.exports = (steps, app, name, step = 'build_internal', front = false) => {
+  const current = _.get(app, `config.services.${name}.${step}`, []);
+  const add = (front) ? _.flatten([steps, current]) : _.flatten([current, steps]);
+  _.set(app, `config.services.${name}.${step}`, _.uniq(add));
+};