From 4e87e54026f83e608500cf4ca6ecc8e8254ec74b Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Sat, 13 Jul 2024 09:21:21 -0400 Subject: [PATCH] update docker compat --- CHANGELOG.md | 8 ++++---- config.yml | 6 +++--- hooks/lando-setup-build-engine-darwin.js | 1 + hooks/lando-setup-build-engine-win32.js | 2 +- utils/get-config-defaults.js | 6 +++--- utils/get-system-cas.js | 1 - 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d15cc98f..04b3dffb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,10 @@ * Improved CA and cert generation * Improved `v3` plugin script automoving * Updated default Docker Compose version to `2.27.1` -* Updated default Docker Desktop for MacOS version to `4.31.0` -* Updated default Docker Desktop for Windows version to `4.31.1` -* Updated default Docker Engine version to `26.1.4` -* Updated tested Docker Desktop range to `<=4.31` +* Updated default Docker Desktop for macOS version to `4.32.0` +* Updated default Docker Desktop for Windows version to `4.32.0` +* Updated default Docker Engine version to `27.0.3` +* Updated tested Docker Desktop range to `<=4.32` ### Internal diff --git a/config.yml b/config.yml index 726c9db19..8a78c1f5e 100644 --- a/config.yml +++ b/config.yml @@ -15,14 +15,14 @@ dockerSupportedVersions: win32: https://docs.docker.com/desktop/install/windows-install/ desktop: satisfies: ">=4.0.0 <5" - tested: "<=4.31.1" + tested: "<=4.32.0" recommendUpdate: "<=4.28.0" link: darwin: https://docs.docker.com/desktop/install/mac-install/ win32: https://docs.docker.com/desktop/install/windows-install/ engine: - satisfies: ">=18 <27" - tested: "<=26.1.4" + satisfies: ">=18 <28" + tested: "<=27.0.3" link: linux: https://docs.docker.com/engine/install/debian/#install-using-the-convenience-script diff --git a/hooks/lando-setup-build-engine-darwin.js b/hooks/lando-setup-build-engine-darwin.js index 739414c3b..eac24e74c 100644 --- a/hooks/lando-setup-build-engine-darwin.js +++ b/hooks/lando-setup-build-engine-darwin.js @@ -7,6 +7,7 @@ const semver = require('semver'); const {color} = require('listr2'); const buildIds = { + '4.32.0': '157355', '4.31.0': '153195', '4.30.0': '149282', '4.29.0': '145265', diff --git a/hooks/lando-setup-build-engine-win32.js b/hooks/lando-setup-build-engine-win32.js index 1a9d4546b..f771e028e 100644 --- a/hooks/lando-setup-build-engine-win32.js +++ b/hooks/lando-setup-build-engine-win32.js @@ -3,11 +3,11 @@ const os = require('os'); const path = require('path'); const semver = require('semver'); - const {color} = require('listr2'); const {nanoid} = require('nanoid'); const buildIds = { + '4.32.0': '157355', '4.31.1': '153621', '4.31.0': '153195', '4.30.0': '149282', diff --git a/utils/get-config-defaults.js b/utils/get-config-defaults.js index 70b43cd7c..3ed3643f1 100644 --- a/utils/get-config-defaults.js +++ b/utils/get-config-defaults.js @@ -8,11 +8,11 @@ const os = require('os'); const getBuildEngineVersion = () => { switch (process.platform) { case 'darwin': - return '4.31.0'; + return '4.32.0'; case 'linux': - return '26.1.4'; + return '27.0.3'; case 'win32': - return '4.31.1'; + return '4.32.0'; } }; diff --git a/utils/get-system-cas.js b/utils/get-system-cas.js index 560279f79..ae1060604 100644 --- a/utils/get-system-cas.js +++ b/utils/get-system-cas.js @@ -8,7 +8,6 @@ module.exports = (format = 'fingerprint') => { return require('mac-ca').get({format}); case 'linux': const {systemCertsSync} = require('system-ca'); - for (const cert of systemCertsSync()) { try { fingerprints.push(require('./get-fingerprint')(cert));