From 6ba8ef493716634611d9ef7dbe9d1be4d5340329 Mon Sep 17 00:00:00 2001 From: Esteban Solano Granados Date: Fri, 21 May 2021 10:43:15 -0600 Subject: [PATCH] =?UTF-8?q?Migrate=20aspnet-mssql=20sample=20to=20.NET=205?= =?UTF-8?q?=20=F0=9F=9A=80=20=20(#143)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated MVC app to .NET 5 Signed-off-by: GitHub * Added SQL Server health check Signed-off-by: GitHub * Updated README.md files with ASP.NET samples Signed-off-by: GitHub --- README.md | 1 + aspnet-mssql/README.md | 2 +- aspnet-mssql/app/Dockerfile | 18 - aspnet-mssql/app/aspnetapp/.gitignore | 442 ++++++++++++++++++++ aspnet-mssql/app/aspnetapp/Dockerfile | 17 + aspnet-mssql/app/aspnetapp/Program.cs | 31 +- aspnet-mssql/app/aspnetapp/Startup.cs | 21 +- aspnet-mssql/app/aspnetapp/aspnetapp.csproj | 11 +- aspnet-mssql/docker-compose.yaml | 13 +- 9 files changed, 495 insertions(+), 61 deletions(-) delete mode 100755 aspnet-mssql/app/Dockerfile create mode 100644 aspnet-mssql/app/aspnetapp/.gitignore create mode 100755 aspnet-mssql/app/aspnetapp/Dockerfile mode change 100755 => 100644 aspnet-mssql/app/aspnetapp/Program.cs mode change 100755 => 100644 aspnet-mssql/app/aspnetapp/aspnetapp.csproj diff --git a/README.md b/README.md index b7664f2..e3a465b 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ with an Nginx proxy and a MySQL database. application with an Nginx proxy and a PostgreSQL database. - [`Java Spark / MySQL`](https://github.com/docker/awesome-compose/tree/master/sparkjava-mysql) - Sample Java application and a MySQL database. +- [`NGINX / ASP.NET / MySQL`](https://github.com/docker/awesome-compose/tree/master/nginx-aspnet-mysql) - Sample Nginx reverse proxy with an C# backend using ASP.NET - [`NGINX / Flask / MongoDB`](https://github.com/docker/awesome-compose/tree/master/nginx-flask-mongo) - Sample Python/Flask application with Nginx proxy and a Mongo database. - [`NGINX / Flask / MySQL`](https://github.com/docker/awesome-compose/tree/master/nginx-flask-mysql) - Sample Python/Flask diff --git a/aspnet-mssql/README.md b/aspnet-mssql/README.md index 5095850..6228cc8 100644 --- a/aspnet-mssql/README.md +++ b/aspnet-mssql/README.md @@ -35,7 +35,7 @@ Make sure port 80 on the host is not being used by another container, otherwise $ docker-compose up -d Creating network "aspnet-mssql_default" with the default driver Building web -Step 1/13 : FROM mcr.microsoft.com/dotnet/core/sdk:2.1 AS build +Step 1/13 : FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build 2.1: Pulling from dotnet/core/sdk .... .... diff --git a/aspnet-mssql/app/Dockerfile b/aspnet-mssql/app/Dockerfile deleted file mode 100755 index 9d74651..0000000 --- a/aspnet-mssql/app/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:2.1 AS build -WORKDIR /app - -# copy csproj and restore as distinct layers -COPY *.sln . -COPY aspnetapp/*.csproj ./aspnetapp/ -RUN dotnet restore - -# copy everything else and build app -COPY aspnetapp/. ./aspnetapp/ -WORKDIR /app/aspnetapp -RUN dotnet publish -c Release -o out - - -FROM mcr.microsoft.com/dotnet/core/aspnet:2.1 AS runtime -WORKDIR /app -COPY --from=build /app/aspnetapp/out ./ -ENTRYPOINT ["dotnet", "aspnetapp.dll"] diff --git a/aspnet-mssql/app/aspnetapp/.gitignore b/aspnet-mssql/app/aspnetapp/.gitignore new file mode 100644 index 0000000..920d1cd --- /dev/null +++ b/aspnet-mssql/app/aspnetapp/.gitignore @@ -0,0 +1,442 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*[.json, .xml, .info] + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +## +## Visual studio for Mac +## + + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# JetBrains Rider +.idea/ +*.sln.iml + +## +## Visual Studio Code +## +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json diff --git a/aspnet-mssql/app/aspnetapp/Dockerfile b/aspnet-mssql/app/aspnetapp/Dockerfile new file mode 100755 index 0000000..dd5d671 --- /dev/null +++ b/aspnet-mssql/app/aspnetapp/Dockerfile @@ -0,0 +1,17 @@ + +FROM mcr.microsoft.com/dotnet/aspnet:5.0 as base +WORKDIR /app + +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build +COPY . /src +WORKDIR /src +RUN ls +RUN dotnet build "aspnetapp.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "aspnetapp.csproj" -c Release -o /app/publish + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "aspnetapp.dll"] \ No newline at end of file diff --git a/aspnet-mssql/app/aspnetapp/Program.cs b/aspnet-mssql/app/aspnetapp/Program.cs old mode 100755 new mode 100644 index e7fc5b1..eff944f --- a/aspnet-mssql/app/aspnetapp/Program.cs +++ b/aspnet-mssql/app/aspnetapp/Program.cs @@ -1,24 +1,21 @@ using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; +using aspnetapp; +using Microsoft.Extensions.Hosting; -namespace aspnetapp +class Program { - public class Program + public static void Main(string[] args) { - public static void Main(string[] args) - { - CreateWebHostBuilder(args).Build().Run(); - } - - public static IWebHostBuilder CreateWebHostBuilder(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup(); + CreateHostBuilder(args).Build().Run(); } -} + + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); +} \ No newline at end of file diff --git a/aspnet-mssql/app/aspnetapp/Startup.cs b/aspnet-mssql/app/aspnetapp/Startup.cs index 1f83f68..d08cbf7 100755 --- a/aspnet-mssql/app/aspnetapp/Startup.cs +++ b/aspnet-mssql/app/aspnetapp/Startup.cs @@ -1,14 +1,11 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.HttpsPolicy; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; namespace aspnetapp { @@ -32,11 +29,12 @@ namespace aspnetapp }); - services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1); + services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0); + services.AddControllers(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { if (env.IsDevelopment()) { @@ -48,16 +46,13 @@ namespace aspnetapp app.UseHsts(); } - app.UseHttpsRedirection(); app.UseStaticFiles(); app.UseCookiePolicy(); + app.UseRouting(); - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); + app.UseEndpoints(e => e.MapControllerRoute( + name: "default", + pattern: "{controller=Home}/{action=Index}/{id?}")); } } } diff --git a/aspnet-mssql/app/aspnetapp/aspnetapp.csproj b/aspnet-mssql/app/aspnetapp/aspnetapp.csproj old mode 100755 new mode 100644 index fbc2060..5344c9d --- a/aspnet-mssql/app/aspnetapp/aspnetapp.csproj +++ b/aspnet-mssql/app/aspnetapp/aspnetapp.csproj @@ -1,12 +1,5 @@ - - netcoreapp2.1 - 31051026529000467138 + net5.0 - - - - - - + \ No newline at end of file diff --git a/aspnet-mssql/docker-compose.yaml b/aspnet-mssql/docker-compose.yaml index a8d1e10..402be54 100644 --- a/aspnet-mssql/docker-compose.yaml +++ b/aspnet-mssql/docker-compose.yaml @@ -1,13 +1,20 @@ version: "3.7" services: web: - build: app + build: app/aspnetapp ports: - 80:80 db: environment: ACCEPT_EULA: "Y" SA_PASSWORD: example_123 - expose: - - 1433 image: microsoft/mssql-server-linux + restart: always + healthcheck: + test: ["CMD-SHELL", "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P example_123 -Q 'SELECT 1' || exit 1"] + interval: 10s + retries: 10 + start_period: 10s + timeout: 3s + + \ No newline at end of file