Skip to content

Commit 560ad11

Browse files
author
Mano Marks
authored
Merge pull request dockersamples#78 from ManoMarks/master
updating to latest version of dotnet
2 parents b138c17 + d915241 commit 560ad11

File tree

4 files changed

+25
-30
lines changed

4 files changed

+25
-30
lines changed

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ services:
2525
- back-tier
2626

2727
worker:
28-
build: ./worker
28+
build:
29+
context: ./worker
2930
networks:
3031
- back-tier
3132

worker/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
FROM microsoft/dotnet:1.0.0-preview2-sdk
1+
FROM microsoft/dotnet:1.1.1-sdk
22

33
WORKDIR /code
44

55
ADD src/Worker /code/src/Worker
66

7-
RUN dotnet restore -v minimal src/ \
8-
&& dotnet publish -c Release -o ./ src/Worker/ \
9-
&& rm -rf src/ $HOME/.nuget/
7+
RUN dotnet restore -v minimal src/Worker \
8+
&& dotnet publish -c Release -o "./" "src/Worker/"
109

11-
CMD dotnet Worker.dll
10+
CMD dotnet src/Worker/Worker.dll

worker/src/Worker/Worker.csproj

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp1.0</TargetFramework>
5+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6+
<AssemblyName>Worker</AssemblyName>
7+
<OutputType>Exe</OutputType>
8+
<PackageId>Worker</PackageId>
9+
<ServerGarbageCollection>true</ServerGarbageCollection>
10+
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="StackExchange.Redis" Version="1.1.604-alpha" />
15+
<PackageReference Include="Npgsql" Version="3.1.3" />
16+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
17+
</ItemGroup>
18+
19+
</Project>

worker/src/Worker/project.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)