From 58198939c7974ecee01509f15f29db08afb4104c Mon Sep 17 00:00:00 2001 From: Sebastian Mandrean Date: Tue, 21 Mar 2017 07:39:24 +0100 Subject: [PATCH] [C#][aspnetcore] Fix broken Docker build option & documentation (#5128) * Use lower-case packageName for README.md docker build example * Use dotnet:1.0.3-sdk instead of just "latest" * Regenerate Petstore server sample --- .../codegen/languages/AspNetCoreServerCodegen.java | 1 + .../src/main/resources/aspnetcore/Dockerfile.mustache | 2 +- .../src/main/resources/aspnetcore/README.mustache | 4 ++-- samples/server/petstore/aspnetcore/IO.Swagger.sln | 10 +++++----- samples/server/petstore/aspnetcore/README.md | 4 ++-- samples/server/petstore/aspnetcore/global.json | 2 +- .../petstore/aspnetcore/src/IO.Swagger/Dockerfile | 2 +- .../aspnetcore/src/IO.Swagger/IO.Swagger.xproj | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java index 576211f2c43..bf63ccc253e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java @@ -86,6 +86,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen { super.processOpts(); additionalProperties.put("packageGuid", packageGuid); + additionalProperties.put("dockerTag", this.packageName.toLowerCase()); apiPackage = packageName + ".Controllers"; modelPackage = packageName + ".Models"; diff --git a/modules/swagger-codegen/src/main/resources/aspnetcore/Dockerfile.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/Dockerfile.mustache index 0765ead2db2..6e42c14542a 100644 --- a/modules/swagger-codegen/src/main/resources/aspnetcore/Dockerfile.mustache +++ b/modules/swagger-codegen/src/main/resources/aspnetcore/Dockerfile.mustache @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:latest +FROM microsoft/dotnet:1.0.3-sdk-projectjson ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 diff --git a/modules/swagger-codegen/src/main/resources/aspnetcore/README.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/README.mustache index 451508ad676..6788ea980eb 100644 --- a/modules/swagger-codegen/src/main/resources/aspnetcore/README.mustache +++ b/modules/swagger-codegen/src/main/resources/aspnetcore/README.mustache @@ -22,6 +22,6 @@ build.bat ``` cd src/{{packageName}} -docker build -t {{packageName}} . -docker run -p 5000:5000 {{packageName}} +docker build -t {{dockerTag}} . +docker run -p 5000:5000 {{dockerTag}} ``` diff --git a/samples/server/petstore/aspnetcore/IO.Swagger.sln b/samples/server/petstore/aspnetcore/IO.Swagger.sln index 866d0d2802c..092519859e9 100644 --- a/samples/server/petstore/aspnetcore/IO.Swagger.sln +++ b/samples/server/petstore/aspnetcore/IO.Swagger.sln @@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution global.json = global.json EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.xproj", "{795C6B14-1C3E-45F5-AF6F-EE47B197FF1E}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.xproj", "{3C799344-F285-4669-8FD5-7ED9B795D5C5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,10 +15,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {795C6B14-1C3E-45F5-AF6F-EE47B197FF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {795C6B14-1C3E-45F5-AF6F-EE47B197FF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {795C6B14-1C3E-45F5-AF6F-EE47B197FF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {795C6B14-1C3E-45F5-AF6F-EE47B197FF1E}.Release|Any CPU.Build.0 = Release|Any CPU + {3C799344-F285-4669-8FD5-7ED9B795D5C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3C799344-F285-4669-8FD5-7ED9B795D5C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C799344-F285-4669-8FD5-7ED9B795D5C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3C799344-F285-4669-8FD5-7ED9B795D5C5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/server/petstore/aspnetcore/README.md b/samples/server/petstore/aspnetcore/README.md index 3ed276e77b1..664d66c2cd5 100644 --- a/samples/server/petstore/aspnetcore/README.md +++ b/samples/server/petstore/aspnetcore/README.md @@ -20,6 +20,6 @@ build.bat ``` cd src/IO.Swagger -docker build -t IO.Swagger . -docker run -p 5000:5000 IO.Swagger +docker build -t io.swagger . +docker run -p 5000:5000 io.swagger ``` diff --git a/samples/server/petstore/aspnetcore/global.json b/samples/server/petstore/aspnetcore/global.json index ac4c4297ab6..175b2d57e38 100644 --- a/samples/server/petstore/aspnetcore/global.json +++ b/samples/server/petstore/aspnetcore/global.json @@ -1,7 +1,7 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0-preview3-003171", + "version": "1.0.0-preview2-003121", "runtime": "coreclr" } } \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore/src/IO.Swagger/Dockerfile b/samples/server/petstore/aspnetcore/src/IO.Swagger/Dockerfile index f4abe48a5cb..54915a5e2a0 100644 --- a/samples/server/petstore/aspnetcore/src/IO.Swagger/Dockerfile +++ b/samples/server/petstore/aspnetcore/src/IO.Swagger/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:latest +FROM microsoft/dotnet:1.0.3-sdk-projectjson ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 diff --git a/samples/server/petstore/aspnetcore/src/IO.Swagger/IO.Swagger.xproj b/samples/server/petstore/aspnetcore/src/IO.Swagger/IO.Swagger.xproj index 577ab91b009..5d8610dae5e 100644 --- a/samples/server/petstore/aspnetcore/src/IO.Swagger/IO.Swagger.xproj +++ b/samples/server/petstore/aspnetcore/src/IO.Swagger/IO.Swagger.xproj @@ -6,7 +6,7 @@ - {795C6B14-1C3E-45F5-AF6F-EE47B197FF1E} + {3C799344-F285-4669-8FD5-7ED9B795D5C5} IO.Swagger .\obj .\bin\