use native platform for debug and release as amd64 (#4050)

microsoft · Aug 30, 2023 · ab0c8e3 · ab0c8e3
1 parent fedf5ba
commit ab0c8e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/resources/templates/netCore/Dockerfile.template b/resources/templates/netCore/Dockerfile.template
@@ -23,7 +23,7 @@ USER appuser
 {{/if}}
 {{/if}}
 {{/unless}}
-FROM {{ netCoreSdkBaseImage }} AS build
+FROM --platform=$BUILDPLATFORM {{ netCoreSdkBaseImage }} AS build
 ARG configuration=Release
 WORKDIR /src
 COPY ["{{ workspaceRelative . artifact }}", "{{ dirname (workspaceRelative . artifact) }}/"]

diff --git a/src/tasks/netcore/NetCoreTaskHelper.ts b/src/tasks/netcore/NetCoreTaskHelper.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { parseError } from '@microsoft/vscode-azext-utils';
-import { getNativeArchitecture, normalizeContainerOS } from '@microsoft/vscode-container-client';
+import { normalizeContainerOS } from '@microsoft/vscode-container-client';
 import * as fse from 'fs-extra';
 import * as os from 'os';
 import * as path from 'path';
-import { l10n, WorkspaceFolder } from 'vscode';
+import { WorkspaceFolder, l10n } from 'vscode';
 import { getContainerSecretsFolders, getHostSecretsFolders } from '../../debugging/netcore/AspNetSslHelper';
 import { NetCoreDebugOptions } from '../../debugging/netcore/NetCoreDebugHelper';
 import { vsDbgInstallBasePath } from '../../debugging/netcore/VsDbgHelper';
@@ -20,7 +20,7 @@ import { DockerBuildOptions, DockerBuildTaskDefinitionBase } from '../DockerBuil
 import { DockerBuildTaskDefinition } from '../DockerBuildTaskProvider';
 import { DockerContainerVolume, DockerRunOptions, DockerRunTaskDefinitionBase } from '../DockerRunTaskDefinitionBase';
 import { DockerRunTaskDefinition } from '../DockerRunTaskProvider';
-import { addVolumeWithoutConflicts, DockerBuildTaskContext, DockerRunTaskContext, DockerTaskContext, DockerTaskScaffoldContext, getDefaultContainerName, getDefaultImageName, inferImageName, TaskHelper } from '../TaskHelper';
+import { DockerBuildTaskContext, DockerRunTaskContext, DockerTaskContext, DockerTaskScaffoldContext, TaskHelper, addVolumeWithoutConflicts, getDefaultContainerName, getDefaultImageName, inferImageName } from '../TaskHelper';
 import { updateBlazorManifest } from './updateBlazorManifest';
 
 export interface NetCoreTaskOptions {
@@ -77,7 +77,7 @@ export class NetCoreTaskHelper implements TaskHelper {
                     context: '${workspaceFolder}',
                     platform: {
                         os: normalizeContainerOS(options?.platformOS),
-                        architecture: getNativeArchitecture()
+                        architecture: 'amd64'
                     },
                     pull: true
                 },