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

Jump to bottom

Removing leftovers from a previous merge #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removing leftovers from a previous merge #3

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
10 changes: 1 addition & 9 deletions website/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
# escape=`
<<<<<<< HEAD
FROM microsoft/dotnet-framework:4.7.2-sdk AS build
=======
FROM microsoft/dotnet-framework:4.7.2-sdk AS builder
>>>>>>> 0bc32715c64f97d36407ac1190b30937c09c24ed

WORKDIR C:\src\DockerSamples.SimpleWebsite.Web
COPY src\DockerSamples.SimpleWebsite.Web\packages.config .
RUN nuget restore packages.config -PackagesDirectory ..\packages

COPY src C:\src
<<<<<<< HEAD
RUN msbuild DockerSamples.SimpleWebsite.Web.csproj /p:OutputPath=c:\out\web\SimpleWebsite /p:Configuration=Release
=======
RUN msbuild DockerSamples.SimpleWebsite.Web.csproj /p:OutputPath=c:\out /p:Configuration=Release
>>>>>>> 0bc32715c64f97d36407ac1190b30937c09c24ed

# perf counter exporter
FROM dockersamples/aspnet-monitoring-exporter:4.7.2 AS exporter
Expand All @@ -40,4 +32,4 @@ CMD Start-Service W3SVC; `
Start-Process -NoNewWindow C:\aspnet-exporter\aspnet-exporter.exe; `
C:\ServiceMonitor.exe w3svc

COPY --from=builder C:\out\_PublishedWebsites\DockerSamples.SimpleWebsite.Web C:\web-app
COPY --from=builder C:\out\_PublishedWebsites\DockerSamples.SimpleWebsite.Web C:\web-app