Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker/install: Fix lima failing to download latest Docker archive #477

Merged
merged 1 commit into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions __tests__/docker/install.test.itg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down
2 changes: 1 addition & 1 deletion src/docker/install.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member

@crazy-max crazy-max Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would be nice if get.docker.com could resolve latest by himself 👀

edit: or at least don't take latest into account

srcArchiveChannel: srcArchive.channel,
srcImageTag: (src as InstallSourceImage).tag
});
Expand Down
Loading