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.

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

use assembly name in entrypoint #1723

Merged
merged 1 commit into from
Mar 6, 2020
Merged

use assembly name in entrypoint #1723

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
44 changes: 34 additions & 10 deletions src/configureWorkspace/configureDotNetCore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ import * as semver from 'semver';
import * as vscode from 'vscode';
import { WorkspaceFolder } from 'vscode';
import { IActionContext } from 'vscode-azureextensionui';
import ChildProcessProvider from '../debugging/coreclr/ChildProcessProvider';
import CommandLineDotNetClient from '../debugging/coreclr/CommandLineDotNetClient';
import { LocalFileSystemProvider } from '../debugging/coreclr/fsProvider';
import LocalOSProvider from '../debugging/coreclr/LocalOSProvider';
import { MsBuildNetCoreProjectProvider, NetCoreProjectProvider } from '../debugging/coreclr/netCoreProjectProvider';
import { OSTempFileProvider } from '../debugging/coreclr/tempFileProvider';
import { DockerDebugScaffoldContext } from '../debugging/DebugHelper';
import { dockerDebugScaffoldingProvider, NetCoreScaffoldingOptions } from '../debugging/DockerDebugScaffoldingProvider';
import { ext } from '../extensionVariables';
Expand Down Expand Up @@ -86,7 +92,7 @@ RUN dotnet publish "$project_file_name$" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "$assembly_name$.dll"]
ENTRYPOINT ["dotnet", "$assembly_name$"]
`;

// AT-Kube: /src/Containers.Tools/Containers.Tools.Package/Templates/linux/dotnetcore/aspnetcore/Dockerfile
Expand All @@ -108,7 +114,7 @@ RUN dotnet publish "$project_file_name$" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "$assembly_name$.dll"]
ENTRYPOINT ["dotnet", "$assembly_name$"]
`;

// #endregion
Expand Down Expand Up @@ -137,7 +143,7 @@ RUN dotnet publish "$project_file_name$" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "$assembly_name$.dll"]
ENTRYPOINT ["dotnet", "$assembly_name$"]
`;

// AT-Kube: /src/Containers.Tools/Containers.Tools.Package/Templates/linux/dotnetcore/console/Dockerfile
Expand All @@ -159,7 +165,7 @@ RUN dotnet publish "$project_file_name$" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "$assembly_name$.dll"]
ENTRYPOINT ["dotnet", "$assembly_name$"]
`;

const dotNetComposeTemplate = `version: '3.4'
Expand All @@ -177,19 +183,16 @@ $volumes_list$
`;
// #endregion

function genDockerFile(serviceNameAndRelativePath: string, platform: Platform, os: PlatformOS | undefined, ports: number[], version: string, artifactName: string): string {
function genDockerFile(serviceNameAndRelativePath: string, platform: Platform, os: PlatformOS | undefined, ports: number[], version: string, artifactName: string, assemblyName: string): string {
// VS version of this function is in ResolveImageNames (src/Docker/Microsoft.VisualStudio.Docker.DotNetCore/DockerDotNetCoreScaffoldingProvider.cs)

if (os !== 'Windows' && os !== 'Linux') {
throw new Error(localize('vscode-docker.configureDotNetCore.unexpectedOs', 'Unexpected OS "{0}"', os));
}

let serviceName = path.basename(serviceNameAndRelativePath);
let projectDirectory = path.dirname(serviceNameAndRelativePath);
let projectFileName = path.basename(artifactName);

// We don't want the project folder in $assembly_name$ because the assembly is in /app and WORKDIR has been set to that
let assemblyNameNoExtension = serviceName;
// example: COPY Core2.0ConsoleAppWindows/Core2.0ConsoleAppWindows.csproj Core2.0ConsoleAppWindows/
let copyProjectCommands = `COPY ["${artifactName}", "${projectDirectory}/"]`
let exposeStatements = getExposeStatements(ports);
Expand Down Expand Up @@ -261,7 +264,7 @@ function genDockerFile(serviceNameAndRelativePath: string, platform: Platform, o
.replace(/\$sdk_image_name\$/g, sdkImageName)
.replace(/\$container_project_directory\$/g, projectDirectory)
.replace(/\$project_file_name\$/g, projectFileName)
.replace(/\$assembly_name\$/g, assemblyNameNoExtension)
.replace(/\$assembly_name\$/g, assemblyName)
.replace(/\$copy_project_commands\$/g, copyProjectCommands);

validateForUnresolvedToken(contents);
Expand Down Expand Up @@ -381,6 +384,25 @@ async function initializeForDebugging(context: IActionContext, folder: Workspace
await dockerDebugScaffoldingProvider.initializeNetCoreForDebugging(scaffoldContext, options);
}

async function inferOutputAssemblyName(appProjectFilePath: string): Promise<string> {
const processProvider = new ChildProcessProvider();
const fsProvider = new LocalFileSystemProvider();
const osProvider = new LocalOSProvider();
const dotNetClient = new CommandLineDotNetClient(
processProvider,
fsProvider,
osProvider
);
const netCoreProjectProvider: NetCoreProjectProvider = new MsBuildNetCoreProjectProvider(
fsProvider,
dotNetClient,
new OSTempFileProvider(osProvider, processProvider)
);

const fullOutputPath = await netCoreProjectProvider.getTargetPath(appProjectFilePath);
return path.basename(fullOutputPath);
}

// tslint:disable-next-line: export-name
export async function scaffoldNetCore(context: ScaffolderContext): Promise<ScaffoldFile[]> {
const os = context.os ?? await context.promptForOS();
Expand All @@ -396,6 +418,7 @@ export async function scaffoldNetCore(context: ScaffolderContext): Promise<Scaff
const ports = context.ports ?? (context.platform === '.NET: ASP.NET Core' ? await context.promptForPorts([80, 443]) : undefined);

const rootRelativeProjectFileName = await context.captureStep('project', findCSProjOrFSProjFile)(context.rootFolder);
const projectFullPath = path.join(context.rootFolder, rootRelativeProjectFileName);
const rootRelativeProjectDirectory = path.dirname(rootRelativeProjectFileName);

telemetryProperties.packageFileType = path.extname(rootRelativeProjectFileName);
Expand All @@ -418,7 +441,8 @@ export async function scaffoldNetCore(context: ScaffolderContext): Promise<Scaff
// Ensure the path scaffolded in the Dockerfile uses POSIX separators (which work on both Linux and Windows).
serviceNameAndPathRelative = serviceNameAndPathRelative.replace(/\\/g, '/');

let dockerFileContents = genDockerFile(serviceNameAndPathRelative, context.platform, os, ports, version, workspaceRelativeProjectFileName);
const assemblyName = await inferOutputAssemblyName(projectFullPath);
let dockerFileContents = genDockerFile(serviceNameAndPathRelative, context.platform, os, ports, version, workspaceRelativeProjectFileName, assemblyName);

// Remove multiple empty lines with single empty lines, as might be produced
// if $expose_statements$ or another template variable is an empty string
Expand Down