Skip to content

Commit

Permalink
update docker compat
Browse files Browse the repository at this point in the history
  • Loading branch information
pirog committed Jul 13, 2024
1 parent 2b24b5c commit 4e87e54
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions hooks/lando-setup-build-engine-darwin.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion hooks/lando-setup-build-engine-win32.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
6 changes: 3 additions & 3 deletions utils/get-config-defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
};

Expand Down
1 change: 0 additions & 1 deletion utils/get-system-cas.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 4e87e54

Please sign in to comment.