Merge branch 'main' into 320-fix-setup-on-solus

.github/workflows/pr-core-tests.yml

@@ -14,6 +14,7 @@ jobs:
         leia-test:
           - badname
           - build
+          - c,o,m,m,a
           - cache
           - certs
           - config
@@ -93,7 +94,7 @@ jobs:
       - name: Install pkg dependencies
         run: npm clean-install --prefer-offline --frozen-lockfile --production
       - name: Package into node binary
-        uses: lando/pkg-action@v5
+        uses: lando/pkg-action@v6
         id: pkg-action
         with:
           entrypoint: bin/lando

.github/workflows/pr-docs-tests.yml

@@ -66,7 +66,7 @@ jobs:
       - name: Install pkg dependencies
         run: npm clean-install --prefer-offline --frozen-lockfile --production
       - name: Package into node binary
-        uses: lando/pkg-action@v5
+        uses: lando/pkg-action@v6
         id: pkg-action
         with:
           entrypoint: bin/lando

.github/workflows/pr-setup-linux-tests.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Install pkg dependencies
         run: npm clean-install --prefer-offline --frozen-lockfile --production
       - name: Package into node binary
-        uses: lando/pkg-action@v5
+        uses: lando/pkg-action@v6
         id: pkg-action
         with:
           entrypoint: bin/lando

.github/workflows/pr-setup-macos-tests.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Install pkg dependencies
         run: npm clean-install --prefer-offline --frozen-lockfile --production
       - name: Package into node binary
-        uses: lando/pkg-action@v5
+        uses: lando/pkg-action@v6
         id: pkg-action
         with:
           entrypoint: bin/lando

.github/workflows/pr-setup-windows-tests.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Install pkg dependencies
         run: npm clean-install --prefer-offline --frozen-lockfile --production
       - name: Package into node binary
-        uses: lando/pkg-action@v5
+        uses: lando/pkg-action@v6
         id: pkg-action
         with:
           entrypoint: bin/lando

.gitignore

@@ -37,14 +37,15 @@ coverage/
 
 # lando
 .lando/id
-FATCORE
+checksums.txt
 plugins/*
 !plugins/healthcheck
 !plugins/networking
 !plugins/proxy
 !plugins/scanner
 !plugins/sharing
 !plugins/test
+FATCORE
 
 # docs
 .temp

.npmignore

@@ -1,6 +1,7 @@
 .github
 .nyc_output
 coverage
+dist
 docs
 examples
 guides

CHANGELOG.md

@@ -1,6 +1,17 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
 * Fixed installing CA on Solus
+* Fixed bug where an app’s services were inadvertently reaped if the app’s path included a comma [#322](https://github.com/lando/core/issues/322)
+
+## v3.23.25 - [January 18, 2025](https://github.com/lando/core/releases/tag/v3.23.25)
+
+* Fixed bug causing `--accept-license` flag to not work when installing Docker Desktop on macOS
+* Updated default Docker Desktop version to `4.37.1|2`
+* Updated default Docker Engine version to `27.5.0`
+* Updated default Docker Compose version to `2.31.0`
+* Updated recommended Docker Desktop range to `>=4.37.0`
+* Updated tested Docker Desktop range to `<=4.37`
+* Updated tested Docker Compose range to `<=2.32`
 
 ## v3.23.24 - [January 14, 2025](https://github.com/lando/core/releases/tag/v3.23.24)
 

app.js

@@ -240,6 +240,8 @@ module.exports = async (app, lando) => {
       BITNAMI_DEBUG: 'true',
     },
     labels: {
+      'io.lando.landofiles': app.configFiles.map(file => path.basename(file)).join(','),
+      'io.lando.root': app.root,
       'io.lando.src': app.configFiles.join(','),
       'io.lando.http-ports': '80,443',
     },

builders/lando-v4.js

@@ -443,7 +443,10 @@ module.exports = {
       const labels = merge({}, app.labels, {
         'dev.lando.container': 'TRUE',
         'dev.lando.id': lando.config.id,
+        'dev.lando.landofiles': app.configFiles.map(file => path.basename(file)).join(','),
+        'dev.lando.root': app.root,
         'dev.lando.src': app.root,
+        'io.lando.http-ports': '80,443',
       }, config.labels);
 
       // add it all 2getha

config.yml

@@ -13,21 +13,21 @@ dockerSupportedVersions:
   compose:
     satisfies: "1.x.x || 2.x.x"
     recommendUpdate: "<=2.24.6"
-    tested: "<=2.30.99"
+    tested: "<=2.32.99"
     link:
       linux: https://docs.docker.com/compose/install/#install-compose-on-linux-systems
       darwin: https://docs.docker.com/desktop/install/mac-install/
       win32: https://docs.docker.com/desktop/install/windows-install/
   desktop:
     satisfies: ">=4.0.0 <5"
-    tested: "<=4.36.99"
-    recommendUpdate: "<=4.34.0"
+    tested: "<=4.37.99"
+    recommendUpdate: "<=4.36"
     link:
       darwin: https://docs.docker.com/desktop/install/mac-install/
       win32: https://docs.docker.com/desktop/install/windows-install/
       wsl: https://docs.docker.com/desktop/install/windows-install/
   engine:
     satisfies: ">=18 <28"
-    tested: "<=27.3.1"
+    tested: "<=27.5.99"
     link:
       linux: https://docs.docker.com/engine/install/debian/#install-using-the-convenience-script

examples/c,o,m,m,a/.lando.yml

@@ -0,0 +1,23 @@
+name: commapp
+services:
+  defaults:
+    type: lando
+    services:
+      image: nginx:1.22.1
+      command: /docker-entrypoint.sh nginx -g "daemon off;"
+      ports:
+        - 80
+      volumes:
+        - ./:/usr/share/nginx/html:ro
+
+  defaults-v4:
+    api: 4
+    type: l337
+    image: nginx:1.22.1
+    ports:
+      - 80
+    volumes:
+      - ./:/usr/share/nginx/html:ro
+
+plugins:
+  "@lando/core": "../.."

examples/c,o,m,m,a/README.md

@@ -0,0 +1,35 @@
+# C,O,M,M,A Example
+
+This example exists primarily to test the following:
+
+* [Issue #322](https://github.com/lando/core/issues/322)
+
+## Start up tests
+
+Run the following commands to get up and running with this example.
+
+```bash
+# Should start up successfully
+lando poweroff
+lando start
+```
+
+## Verification commands
+
+Run the following commands to validate things are rolling as they should.
+
+```bash
+# Should serve from the app root by default
+lando exec defaults -- curl http://localhost | grep ROOTDIR
+lando exec defaults-v4 -- curl http://localhost | grep ROOTDIR
+```
+
+## Destroy tests
+
+Run the following commands to trash this app like nothing ever happened.
+
+```bash
+# Should be destroyed with success
+lando destroy -y
+lando poweroff
+```

examples/c,o,m,m,a/index.html

@@ -0,0 +1 @@
+ROOTDIR

examples/lando-v4/.lando.yml

@@ -42,6 +42,8 @@ services:
     # build
     # files
 
+    # check labels
+
     # appmount
     # support appMount but prefer app-mount
     # project-mount: /project how does this work?

hooks/lando-setup-build-engine-darwin.js

@@ -10,6 +10,9 @@ const semver = require('semver');
 const {color} = require('listr2');
 
 const buildIds = {
+  '4.37.2': '179585',
+  '4.37.1': '178610',
+  '4.37.0': '178034',
   '4.36.0': '175267',
   '4.35.1': '173168',
   '4.35.0': '172550',

hooks/lando-setup-build-engine-win32.js

@@ -10,6 +10,8 @@ const {color} = require('listr2');
 const {nanoid} = require('nanoid');
 
 const buildIds = {
+  '4.37.1': '178610',
+  '4.37.0': '178034',
   '4.36.0': '175267',
   '4.35.1': '173168',
   '4.35.0': '172550',

hooks/lando-setup-build-engine-wsl.js

@@ -12,6 +12,8 @@ const {color} = require('listr2');
 const {nanoid} = require('nanoid');
 
 const buildIds = {
+  '4.37.1': '178610',
+  '4.37.0': '178034',
   '4.36.0': '175267',
   '4.35.1': '173168',
   '4.35.0': '172550',

hooks/lando-setup-orchestrator.js

@@ -7,7 +7,7 @@ const path = require('path');
 /*
  * Helper to get docker compose v2 download url
  */
-const getComposeDownloadUrl = (version = '2.30.3') => {
+const getComposeDownloadUrl = (version = '2.31.0') => {
   const mv = version.split('.')[0] > 1 ? '2' : '1';
   const arch = process.arch === 'arm64' ? 'aarch64' : 'x86_64';
   const toggle = `${process.platform}-${mv}`;
@@ -31,7 +31,7 @@ const getComposeDownloadUrl = (version = '2.30.3') => {
 /*
  * Helper to get docker compose v2 download destination
  */
-const getComposeDownloadDest = (base, version = '2.30.3') => {
+const getComposeDownloadDest = (base, version = '2.31.0') => {
   switch (process.platform) {
     case 'linux':
     case 'darwin':

lib/daemon.js

@@ -53,7 +53,7 @@ module.exports = class LandoDaemon {
       log = new Log(),
       context = 'node',
       compose = require('../utils/get-compose-x')(),
-      orchestratorVersion = '2.30.3',
+      orchestratorVersion = '2.31.0',
       userConfRoot = path.join(os.homedir(), '.lando'),
   ) {
     this.cache = cache;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/core",
   "description": "The libraries that power all of Lando.",
-  "version": "3.23.24",
+  "version": "3.23.25",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/core",

release-aliases/3-EDGE

@@ -1 +1 @@
-v3.24.0-beta.9
+v3.24.0-beta.11

release-aliases/3-STABLE

@@ -1 +1 @@
-v3.23.24
+v3.23.25

scripts/install-docker-desktop.sh

@@ -59,7 +59,7 @@ debug "INSTALLER: $INSTALLER"
 debug "USER: $USER"
 
 # add accept license if set
-if [ "${DEBUG}" == 1 ]; then OPTS="$OPTS --accept-license"; fi
+if [ "${ACCEPT_LICENSE}" == 1 ]; then OPTS="$OPTS --accept-license"; fi
 
 # run
 hdiutil attach "$INSTALLER"

scripts/install-docker-engine.sh

@@ -3,7 +3,7 @@ set -eo pipefail
 
 DEBUG=0
 INSTALLER="get-docker.sh"
-VERSION="27.3.1"
+VERSION="27.5.0"
 OPTS=
 
 debug() {

utils/get-compose-x.js

@@ -27,7 +27,7 @@ const getDockerBin = (bin, base, pathFallback = true) => {
   }
 };
 
-module.exports = ({orchestratorVersion = '2.30.3', userConfRoot = os.tmpdir()} = {}) => {
+module.exports = ({orchestratorVersion = '2.31.0', userConfRoot = os.tmpdir()} = {}) => {
   const orchestratorBin = `docker-compose-v${orchestratorVersion}`;
   switch (process.platform) {
     case 'darwin':

utils/get-config-defaults.js

@@ -8,20 +8,20 @@ const os = require('os');
 const getBuildEngineVersion = (platform = process.landoPlatform ?? process.platform) => {
   switch (platform) {
     case 'darwin':
-      return '4.36.0';
+      return '4.37.2';
     case 'linux':
-      return '27.3.1';
+      return '27.5.0';
     case 'win32':
-      return '4.36.0';
+      return '4.37.1';
     case 'wsl':
-      return '4.36.0';
+      return '4.37.1';
   }
 };
 
 // Default config
 const defaultConfig = options => ({
   orchestratorSeparator: '_',
-  orchestratorVersion: '2.30.3',
+  orchestratorVersion: '2.31.0',
   configSources: [],
   coreBase: path.resolve(__dirname, '..'),
   disablePlugins: [],