diff --git a/Dockerfile.dev b/Dockerfile.dev index 69de9fe..2287b6e 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,11 +1,11 @@ -FROM registry.71dev.com/dotnetsdk:3.1 as build-env +FROM mcr.microsoft.com/dotnet/sdk:5.0 as build-env WORKDIR /source COPY . . RUN dotnet restore --configfile nuget.config RUN dotnet build RUN dotnet publish -o /publish --configuration Release; -FROM registry.71dev.com/dotnetsdk:3.1 +FROM mcr.microsoft.com/dotnet/sdk:5.0 COPY . . RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends apt-utils RUN DEBIAN_FRONTEND=noninteractive apt-get install -y fontconfig @@ -20,4 +20,4 @@ RUN fc-cache -fv WORKDIR /app COPY --from=build-env /publish . ENV ASPNETCORE_URLS http://*:8080 -ENTRYPOINT ["dotnet", "rmutr_report.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "rmutr_report.dll"] diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 1321340..d2c8860 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index 5bdfb7f..90936ed 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index e6f7596..9911ae8 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -1,22 +1,16 @@ -# This is a sample build configuration for .NET Core. -# Check our guides at https://confluence.atlassian.com/x/5Q4SMw for more examples. -# Only use spaces to indent your .yml configuration. -# ----- -# You can specify a custom docker image from Docker Hub as your build environment. image: atlassian/default-image:2 -options: - docker: true pipelines: default: - step: + size: 2x + services: + - docker runs-on: - self.hosted - linux caches: - dotnetcore - script: # Modify the commands below to build your repository. - # - dotnet restore - # - dotnet build + script: - docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD - docker build -f Dockerfile.dev -t registry.71dev.com/rmutr_report:latest . - docker push registry.71dev.com/rmutr_report:latest @@ -24,8 +18,12 @@ pipelines: runs-on: - self.hosted - linux - name: deploy to kubernates + name: Deploy image: atlassian/pipelines-kubectl script: - echo $KUBE_CONFIG | base64 -d > kubeconfig - - kubectl --insecure-skip-tls-verify --kubeconfig=kubeconfig --namespace=rmutr rollout restart deployment/rmutr-report \ No newline at end of file + - kubectl --insecure-skip-tls-verify --kubeconfig=kubeconfig rollout restart deployment/rmutr_report +definitions: + services: + docker: + memory: 7128 \ No newline at end of file diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs new file mode 100644 index 0000000..39daae7 --- /dev/null +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] +[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache new file mode 100644 index 0000000..337d668 --- /dev/null +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +b48f1bd72c29690b00599a37fe20d70100e422f1 diff --git a/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..c04e72e --- /dev/null +++ b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,10 @@ +is_global = true +build_property.TargetFramework = net5.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = true +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = rmutr_report +build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\ diff --git a/obj/Debug/net5.0/rmutr_report.assets.cache b/obj/Debug/net5.0/rmutr_report.assets.cache new file mode 100644 index 0000000..3b0323b Binary files /dev/null and b/obj/Debug/net5.0/rmutr_report.assets.cache differ diff --git a/obj/Debug/net5.0/rmutr_report.csproj.AssemblyReference.cache b/obj/Debug/net5.0/rmutr_report.csproj.AssemblyReference.cache new file mode 100644 index 0000000..76a2b0b Binary files /dev/null and b/obj/Debug/net5.0/rmutr_report.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 1321340..d2c8860 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 5bdfb7f..90936ed 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/project.assets.json b/obj/project.assets.json index 1c2e072..13c8c8c 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -1,7 +1,7 @@ { "version": 3, "targets": { - ".NETCoreApp,Version=v3.1": { + "net5.0": { "ClosedXML/0.96.0": { "type": "package", "dependencies": { @@ -446,12 +446,12 @@ "Swashbuckle.AspNetCore.SwaggerGen": "6.5.0" }, "compile": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Annotations.dll": { + "lib/net5.0/Swashbuckle.AspNetCore.Annotations.dll": { "related": ".pdb;.xml" } }, "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Annotations.dll": { + "lib/net5.0/Swashbuckle.AspNetCore.Annotations.dll": { "related": ".pdb;.xml" } } @@ -462,12 +462,12 @@ "Microsoft.OpenApi": "1.2.3" }, "compile": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": { + "lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll": { "related": ".pdb;.xml" } }, "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": { + "lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll": { "related": ".pdb;.xml" } }, @@ -481,12 +481,12 @@ "Swashbuckle.AspNetCore.Swagger": "6.5.0" }, "compile": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": { + "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll": { "related": ".pdb;.xml" } }, "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": { + "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll": { "related": ".pdb;.xml" } } @@ -494,12 +494,12 @@ "Swashbuckle.AspNetCore.SwaggerUI/6.5.0": { "type": "package", "compile": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": { + "lib/net5.0/Swashbuckle.AspNetCore.SwaggerUI.dll": { "related": ".pdb;.xml" } }, "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": { + "lib/net5.0/Swashbuckle.AspNetCore.SwaggerUI.dll": { "related": ".pdb;.xml" } }, @@ -2136,7 +2136,7 @@ } }, "projectFileDependencyGroups": { - ".NETCoreApp,Version=v3.1": [ + "net5.0": [ "ClosedXML >= 0.96.0", "FastReport.Core >= 2021.3.0", "Swashbuckle.AspNetCore >= 6.5.0", @@ -2161,15 +2161,15 @@ "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" ], "originalTargetFrameworks": [ - "netcoreapp3.1" + "net5.0" ], "sources": { "https://api.nuget.org/v3/index.json": {}, "https://nuget.71dev.com/v3/index.json": {} }, "frameworks": { - "netcoreapp3.1": { - "targetAlias": "netcoreapp3.1", + "net5.0": { + "targetAlias": "net5.0", "projectReferences": {} } }, @@ -2180,8 +2180,8 @@ } }, "frameworks": { - "netcoreapp3.1": { - "targetAlias": "netcoreapp3.1", + "net5.0": { + "targetAlias": "net5.0", "dependencies": { "ClosedXML": { "target": "Package", diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index aca2bc6..fe8f515 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "AcjdXi5x9A0nxsTWB+2PnbaIBtEgf/xXjiH70whPTOKfE3hLR7xlfQsZ/JREuaGE/sSzaWLOjWThFS4rkZ0mog==", + "dgSpecHash": "TgdSlhcNLrmoGcymKBKtBNUewM9z9QdY0FESfevGdFzEBUl5TotP+ysyCZqFpczcvGDJdBKPRCtfqngiN8LZRQ==", "success": true, "projectFilePath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", "expectedPackageFiles": [ diff --git a/obj/project.packagespec.json b/obj/project.packagespec.json index b78619f..daed5e1 100644 --- a/obj/project.packagespec.json +++ b/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["netcoreapp3.1"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"netcoreapp3.1":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"netcoreapp3.1":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index b89af49..07a3417 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16886414723877886 \ No newline at end of file +16909613048948705 \ No newline at end of file diff --git a/obj/rmutr_report.csproj.nuget.dgspec.json b/obj/rmutr_report.csproj.nuget.dgspec.json index 0d1d259..6a65beb 100644 --- a/obj/rmutr_report.csproj.nuget.dgspec.json +++ b/obj/rmutr_report.csproj.nuget.dgspec.json @@ -19,15 +19,15 @@ "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" ], "originalTargetFrameworks": [ - "netcoreapp3.1" + "net5.0" ], "sources": { "https://api.nuget.org/v3/index.json": {}, "https://nuget.71dev.com/v3/index.json": {} }, "frameworks": { - "netcoreapp3.1": { - "targetAlias": "netcoreapp3.1", + "net5.0": { + "targetAlias": "net5.0", "projectReferences": {} } }, @@ -38,8 +38,8 @@ } }, "frameworks": { - "netcoreapp3.1": { - "targetAlias": "netcoreapp3.1", + "net5.0": { + "targetAlias": "net5.0", "dependencies": { "ClosedXML": { "target": "Package", diff --git a/rmutr_report.csproj b/rmutr_report.csproj index 79cd0c4..1d2b290 100644 --- a/rmutr_report.csproj +++ b/rmutr_report.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 true