From 669c1755a865535e214c47af5187ff03792216e0 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 3 Jul 2017 11:24:16 -0700 Subject: [PATCH] Remove dockerfiles, update readme, and add issue and PR templates (#812) --- .dockerignore | 45 ----------------------------------- .github/ISSUE_TEMPLATE | 4 ++++ .github/PULL_REQUEST_TEMPLATE | 4 ++++ Dockerfile.windows | 17 ------------- README.md | 38 ++++++++++------------------- docker-compose.windows.yml | 25 ------------------- 6 files changed, 21 insertions(+), 112 deletions(-) delete mode 100644 .dockerignore create mode 100644 .github/ISSUE_TEMPLATE create mode 100644 .github/PULL_REQUEST_TEMPLATE delete mode 100644 Dockerfile.windows delete mode 100644 docker-compose.windows.yml diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 4a71c20425..0000000000 --- a/.dockerignore +++ /dev/null @@ -1,45 +0,0 @@ -.git - -**/Obj/ -**/obj/ -**/bin/ -**/Bin/ -.vs/ -*.xap -*.user -/TestResults -*.vspscc -*.vssscc -*.suo -*.cache -*.docstates -_ReSharper.* -*.csproj.user -*[Rr]e[Ss]harper.user -_ReSharper.*/ -packages/* -artifacts/* -msbuild.log -PublishProfiles/ -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.log -*.vspx -/.symbols -nuget.exe -build/ -*net45.csproj -*k10.csproj -App_Data/ -bower_components -node_modules -*.sln.ide -*.ng.ts -*.sln.ide -.build/ -.testpublish/ -launchSettings.json diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE new file mode 100644 index 0000000000..5092cf58c2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE @@ -0,0 +1,4 @@ +This repository is a test application used for ASP.NET Core internal test processes. +It is not intended to be a representative sample of how to use ASP.NET Core. + +Samples and docs for ASP.NET Core can be found here: https://docs.asp.net. diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE new file mode 100644 index 0000000000..5092cf58c2 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE @@ -0,0 +1,4 @@ +This repository is a test application used for ASP.NET Core internal test processes. +It is not intended to be a representative sample of how to use ASP.NET Core. + +Samples and docs for ASP.NET Core can be found here: https://docs.asp.net. diff --git a/Dockerfile.windows b/Dockerfile.windows deleted file mode 100644 index fc0f17ee3f..0000000000 --- a/Dockerfile.windows +++ /dev/null @@ -1,17 +0,0 @@ -FROM microsoft/dotnet:1.1-sdk-msbuild - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN New-Item -Path \MusicStore\samples\MusicStore -Type Directory -WORKDIR MusicStore - -ADD samples/MusicStore/MusicStore.csproj samples/MusicStore/MusicStore.csproj -ADD NuGet.config . -RUN dotnet restore .\samples\MusicStore - -ADD samples samples -RUN dotnet build .\samples\MusicStore - -EXPOSE 5000 -ENV ASPNETCORE_URLS http://0.0.0.0:5000 -CMD dotnet run -p .\samples\MusicStore diff --git a/README.md b/README.md index df6e065248..7574a9b660 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,20 @@ -MusicStore test application -============================================ +MusicStore (test application) +============================= -AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/ja8a7j6jscj7k3xa/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/MusicStore/branch/dev) +AppVeyor: [![AppVeyor][appveyor-badge]][appveyor-build] -Travis: [![Travis](https://travis-ci.org/aspnet/MusicStore.svg?branch=dev)](https://travis-ci.org/aspnet/MusicStore) +Travis: [![Travis][travis-badge]][travis-build] + +[appveyor-badge]: https://ci.appveyor.com/api/projects/status/ja8a7j6jscj7k3xa/branch/dev?svg=true +[appveyor-build]: https://ci.appveyor.com/project/aspnetci/MusicStore/branch/dev +[travis-badge]: https://travis-ci.org/aspnet/MusicStore.svg?branch=dev +[travis-build]: https://travis-ci.org/aspnet/MusicStore This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. -## Run the application: -* If you have Visual Studio 2017 - 1. Open MusicStore.sln in Visual Studio 2017 and run the individual applications on `IIS Express`. +## About this repo -* If you don't have Visual Studio 2017 - 1. Open a command prompt and execute `cd \src\MusicStore\`. - 2. Execute `dotnet restore`. +This repository is a test application used for ASP.NET Core internal test processes. +It is not intended to be a representative sample of how to use ASP.NET Core. -**NOTE:** App and tests require Visual Studio 2017 LocalDB on the machine to run. -**NOTE:** Since SQL Server is not generlly available on Mac, the InMemoryStore is used to run the application. So the changes that you make will not be persisted. - -## Run on Docker Windows Containers - - * [Install Docker for Windows](https://docs.docker.com/docker-for-windows/) or [setup up Docker Windows containers](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/containers_welcome) - * `docker-compose -f .\docker-compose.windows.yml build` - * `docker-compose -f .\docker-compose.windows.yml up` - * Access MusicStore on either the Windows VM IP or (if container is running locally) on the container IP: `docker inspect -f "{{ .NetworkSettings.Networks.nat.IPAddress }}" musicstore_web_1` - -## NTLM authentication -More information at [samples/MusicStore/StartupNtlmAuthentication.cs](StartupNtlmAuthentication). - -## OpenIdConnect authentication -More information at [samples/MusicStore/StartupOpenIdConnect.cs](StartupOpenIdConnect). +Samples and docs for ASP.NET Core can be found here: . diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml deleted file mode 100644 index 7d7e74c8fb..0000000000 --- a/docker-compose.windows.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: '3' -services: - db: - image: microsoft/mssql-server-windows-express - environment: - sa_password: "Password1" - ACCEPT_EULA: "Y" - ports: - - "1433:1433" # REMARK: This is currently required, needs investigation - - web: - build: - context: . - dockerfile: Dockerfile.windows - environment: - - "Data:DefaultConnection:ConnectionString=Server=db,1433;Database=MusicStore;User Id=sa;Password=Password1;MultipleActiveResultSets=True" - depends_on: - - "db" - ports: - - "5000:5000" - -networks: - default: - external: - name: nat