Merge pull request #398 from swagger-api/fix-aspnet

fix aspnetcore version in dockerfile

src/main/java/io/swagger/codegen/v3/generators/dotnet/AspNetCoreServerCodegen.java

@@ -128,10 +128,12 @@ public void processOpts() {
  apiTemplateFiles.put("controller.mustache", ".cs");
  supportingFiles.add(new SupportingFile("Program.mustache", packageFolder, "Program.cs"));
  supportingFiles.add(new SupportingFile("Project.csproj.mustache", packageFolder, this.packageName + ".csproj"));
+ supportingFiles.add(new SupportingFile("Dockerfile.mustache", packageFolder, "Dockerfile"));
  } else{
  apiTemplateFiles.put("2.1/controller.mustache", ".cs");
  supportingFiles.add(new SupportingFile("2.1/Program.mustache", packageFolder, "Program.cs"));
  supportingFiles.add(new SupportingFile("2.1/Project.csproj.mustache", packageFolder, this.packageName + ".csproj"));
+ supportingFiles.add(new SupportingFile("2.1/Dockerfile.mustache", packageFolder, "Dockerfile"));
  }
 
  if (!additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
@@ -149,7 +151,6 @@ public void processOpts() {
  supportingFiles.add(new SupportingFile("build.bat.mustache", "", "build.bat"));
  supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
  supportingFiles.add(new SupportingFile("Solution.mustache", "", this.packageName + ".sln"));
- supportingFiles.add(new SupportingFile("Dockerfile.mustache", packageFolder, "Dockerfile"));
  supportingFiles.add(new SupportingFile("gitignore", packageFolder, ".gitignore"));
  supportingFiles.add(new SupportingFile("appsettings.json", packageFolder, "appsettings.json"));
 

src/main/resources/handlebars/aspnetcore/2.1/Dockerfile.mustache

@@ -0,0 +1,18 @@
+FROM mcr.microsoft.com/dotnet/core/sdk:{{aspNetCoreVersion}} AS build-env
+WORKDIR /app
+
+ENV DOTNET_CLI_TELEMETRY_OPTOUT 1
+
+# copy csproj and restore as distinct layers
+COPY *.csproj ./
+RUN dotnet restore
+
+# copy everything else and build
+COPY . ./
+RUN dotnet publish -c Release -o out
+
+# build runtime image
+FROM mcr.microsoft.com/dotnet/core/aspnet:{{aspNetCoreVersion}}
+WORKDIR /app
+COPY --from=build-env /app/out .
+ENTRYPOINT ["dotnet", "{{packageName}}.dll"]

src/main/resources/handlebars/aspnetcore/Dockerfile.mustache

@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore-build:2.0 AS build-env
+FROM microsoft/aspnetcore-build:{{aspNetCoreVersion}} AS build-env
 WORKDIR /app
 
 ENV DOTNET_CLI_TELEMETRY_OPTOUT 1
@@ -12,7 +12,7 @@ COPY . ./
 RUN dotnet publish -c Release -o out
 
 # build runtime image
-FROM microsoft/aspnetcore:2.0
+FROM microsoft/aspnetcore:{{aspNetCoreVersion}}
 WORKDIR /app
 COPY --from=build-env /app/out .
 ENTRYPOINT ["dotnet", "{{packageName}}.dll"]