Skip to content

Explictly set platform flag to prevent mismatches and errors for docker commands #1149

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.

Sign up for GitHub

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

Open
abdurriq wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −2
Open

Explictly set platform flag to prevent mismatches and errors for docker commands #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/spec-node/singleContainer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/


import { createContainerProperties, startEventSeen, ResolverResult, getTunnelInformation, getDockerfilePath, getDockerContextPath, DockerResolverParameters, isDockerFileConfig, uriToWSLFsPath, WorkspaceConfiguration, getFolderImageName, inspectDockerImage, logUMask, SubstitutedConfig, checkDockerSupportForGPU, isBuildKitImagePolicyError, isBuildxCacheToInline } from './utils';
import { createContainerProperties, startEventSeen, ResolverResult, getTunnelInformation, getDockerfilePath, getDockerContextPath, DockerResolverParameters, isDockerFileConfig, uriToWSLFsPath, WorkspaceConfiguration, getFolderImageName, inspectDockerImage, logUMask, SubstitutedConfig, checkDockerSupportForGPU, isBuildKitImagePolicyError, isBuildxCacheToInline, toPlatformString } from './utils';
import { ContainerProperties, setupInContainer, ResolverProgress, ResolverParameters } from '../spec-common/injectHeadless';
import { ContainerError, toErrorText } from '../spec-common/errors';
import { ContainerDetails, listContainers, DockerCLIParameters, inspectContainers, dockerCLI, dockerPtyCLI, toPtyExecParameters, ImageDetails, toExecParameters, removeContainer } from '../spec-shutdown/dockerUtils';
Expand Down Expand Up @@ -405,11 +405,13 @@ while sleep 1 & wait $!; do :; done`, '-']; // `wait $!` allows for the `trap` t
cmd.push(...details.Config.Cmd || []);
}

const platformArgs = ['--platform', toPlatformString(params.platformInfo)];
const args = [
'run',
'--sig-proxy=false',
'-a', 'STDOUT',
'-a', 'STDERR',
...platformArgs,
...exposed,
...cwdMount,
...additionalMount,
Expand Down
8 changes: 7 additions & 1 deletion src/spec-node/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,11 @@ export function isBuildKitImagePolicyError(err: any): boolean {
|| (errStderr && typeof errStderr === 'string' && (errStderr.includes(imagePolicyErrorString) || errStderr.includes(sourceDeniedString)));
}

export function toPlatformString(platformInfo: PlatformInfo): string {
const base = `${platformInfo.os}/${platformInfo.arch}`;
return platformInfo.variant ? `${base}/${platformInfo.variant}` : base;
}

export async function inspectDockerImage(params: DockerResolverParameters | DockerCLIParameters, imageName: string, pullImageOnError: boolean) {
try {
return await inspectImage(params, imageName);
Expand All @@ -254,7 +259,8 @@ export async function inspectDockerImage(params: DockerResolverParameters | Dock
output.write(`Error fetching image details: ${err2?.message}`);
}
try {
await retry(async () => dockerPtyCLI(params, 'pull', imageName), { maxRetries: 5, retryIntervalMilliseconds: 1000, output });
const platformString = toPlatformString(params.platformInfo);
await retry(async () => dockerPtyCLI(params, 'pull', '--platform', platformString, imageName), { maxRetries: 5, retryIntervalMilliseconds: 1000, output });
} catch (_err) {
if (err.stdout) {
output.write(err.stdout.toString());
Expand Down
Loading