From 383bb3b384afd0104f1528d37696dc21660f0417 Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Sat, 18 Jan 2025 09:38:56 -0500 Subject: [PATCH] backport docker updates and fixes from edge --- .gitignore | 3 ++- .npmignore | 1 + CHANGELOG.md | 8 ++++++++ checksums.txt | 0 config.yml | 8 ++++---- hooks/lando-setup-build-engine-darwin.js | 3 +++ hooks/lando-setup-build-engine-win32.js | 2 ++ hooks/lando-setup-build-engine-wsl.js | 2 ++ hooks/lando-setup-orchestrator.js | 4 ++-- lib/daemon.js | 2 +- scripts/install-docker-desktop.sh | 2 +- scripts/install-docker-engine.sh | 2 +- utils/get-compose-x.js | 2 +- utils/get-config-defaults.js | 10 +++++----- 14 files changed, 33 insertions(+), 16 deletions(-) delete mode 100644 checksums.txt diff --git a/.gitignore b/.gitignore index d9a3c39f6..77c875a5d 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,7 @@ coverage/ # lando .lando/id -FATCORE +checksums.txt plugins/* !plugins/healthcheck !plugins/networking @@ -45,6 +45,7 @@ plugins/* !plugins/scanner !plugins/sharing !plugins/test +FATCORE # docs .temp diff --git a/.npmignore b/.npmignore index 233074207..4697cbc1a 100644 --- a/.npmignore +++ b/.npmignore @@ -1,6 +1,7 @@ .github .nyc_output coverage +dist docs examples guides diff --git a/CHANGELOG.md b/CHANGELOG.md index 1678f643d..a398fc2e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) +* 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) * Fixed bug causing service script moving to fail when receiving non-stringy inputs diff --git a/checksums.txt b/checksums.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/config.yml b/config.yml index abbb1be3b..9d25a6bac 100644 --- a/config.yml +++ b/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 diff --git a/hooks/lando-setup-build-engine-darwin.js b/hooks/lando-setup-build-engine-darwin.js index c291b7ba7..337cf629a 100644 --- a/hooks/lando-setup-build-engine-darwin.js +++ b/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', diff --git a/hooks/lando-setup-build-engine-win32.js b/hooks/lando-setup-build-engine-win32.js index bfedd2ce8..b21a1b311 100644 --- a/hooks/lando-setup-build-engine-win32.js +++ b/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', diff --git a/hooks/lando-setup-build-engine-wsl.js b/hooks/lando-setup-build-engine-wsl.js index 2877cbf6a..b2e2a8bc6 100644 --- a/hooks/lando-setup-build-engine-wsl.js +++ b/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', diff --git a/hooks/lando-setup-orchestrator.js b/hooks/lando-setup-orchestrator.js index 7d6144780..d01dc7735 100644 --- a/hooks/lando-setup-orchestrator.js +++ b/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': diff --git a/lib/daemon.js b/lib/daemon.js index d98da204e..2d3bb8435 100644 --- a/lib/daemon.js +++ b/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; diff --git a/scripts/install-docker-desktop.sh b/scripts/install-docker-desktop.sh index 50fcb2dd7..80440abbf 100755 --- a/scripts/install-docker-desktop.sh +++ b/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" diff --git a/scripts/install-docker-engine.sh b/scripts/install-docker-engine.sh index f94aaad47..3aa19f69b 100755 --- a/scripts/install-docker-engine.sh +++ b/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() { diff --git a/utils/get-compose-x.js b/utils/get-compose-x.js index 5a37f2756..ace77eda6 100644 --- a/utils/get-compose-x.js +++ b/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': diff --git a/utils/get-config-defaults.js b/utils/get-config-defaults.js index cc9b3803b..faa617bcf 100644 --- a/utils/get-config-defaults.js +++ b/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: [],