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

docker/install: Fix lima failing to download latest Docker archive
2024-10-29 16:08:17 +01:00 · 2024-10-29 15:46:41 +01:00
2 changed files with 2 additions and 1 deletions
--- a/tests/docker/install.test.itg.ts
+++ b/tests/docker/install.test.itg.ts
@@ -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')) {
--- a/src/docker/install.ts
+++ b/src/docker/install.ts
@@ -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
      });
Author	SHA1	Message	Date
CrazyMax	bdd1a426f5	Merge pull request #477 from vvoland/docker-install-archive-version Some checks failed publish / publish (push) Has been cancelled Details docker/install: Fix lima failing to download latest Docker archive	2024-10-29 16:08:17 +01:00
Paweł Gronowski	e2acba1767	docker/install: Fix lima failing to download latest Docker archive Use the actual version number resolved from the Github releases instead of the `latest` string. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2024-10-29 15:46:41 +01:00