Merge pull request #477 from vvoland/docker-install-archive-version

docker/install: Fix lima failing to download latest Docker archive
This commit is contained in:
CrazyMax 2024-10-29 16:08:17 +01:00 committed by GitHub
commit bdd1a426f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions

View File

@ -44,6 +44,7 @@ aarch64:https://cloud.debian.org/images/cloud/bookworm/20231013-1532/debian-12-g
{type: 'image', tag: '27.3.1'} as InstallSourceImage,
{type: 'image', tag: 'master'} as InstallSourceImage,
{type: 'archive', version: 'v26.1.4', channel: 'stable'} as InstallSourceArchive,
{type: 'archive', version: 'latest', channel: 'stable'} as InstallSourceArchive,
])(
'install docker %s', async (source) => {
if (process.env.ImageOS && process.env.ImageOS.startsWith('ubuntu')) {

View File

@ -230,7 +230,7 @@ export class Install {
daemonConfig: limaDaemonConfig,
dockerSock: `${limaDir}/docker.sock`,
srcType: src.type,
srcArchiveVersion: srcArchive.version?.replace(/^v/, ''),
srcArchiveVersion: this._version, // Use the resolved version (e.g. latest -> 27.4.0)
srcArchiveChannel: srcArchive.channel,
srcImageTag: (src as InstallSourceImage).tag
});