Граф коммитов

43 Коммитов

Автор SHA1 Сообщение Дата
Chiyuan Ma 31babcfa42 add simi colon 2018-02-08 17:43:51 -08:00
Chiyuan Ma 2684147e1f add simi colon 2018-02-08 17:38:31 -08:00
Sourabh Shirhatti 45e5f86dfa Update SM URI 2018-02-08 12:44:04 -08:00
Sourabh Shirhatti 4a44ef8367 Add SM in previous RUN statement 2018-02-07 13:35:20 -08:00
Sourabh Shirhatti 1f23722e24 Remove stray COPY 2018-02-07 12:41:58 -08:00
Sourabh Shirhatti 5c09659220 Download servicemonitor 2018-02-06 12:26:49 -08:00
Hong Li f9100d078b
address issue#72, issue#73 and issue#74 (#85)
* address issue#72, issue#73 and issue#74

* update to #85
2018-01-18 13:37:31 -08:00
Michael Simons e6fd56c4ff
Merge pull request #75 from MichaelSimons/folder-refactor
Refactor folder layout to prepare for build images
2017-11-28 14:09:37 -06:00
MichaelSimons a77f88bac5 Refactor folder layout to prepare for build images 2017-11-27 14:53:12 -06:00
Hong Li e788e25d6a update README.md 2017-10-27 14:27:41 -07:00
chiyuan ma 68b1ede3db Merge pull request #61 from Microsoft/aspnetdocker1709
Add ASP.NET 3.5 image for 1709
2017-10-26 13:19:02 -07:00
Hong Li 891158ea85 adding ServiceMonitor.exe 2017-10-26 10:47:37 -07:00
Hong Li 4cefc4344c Add ASP.NET 3.5 image for 1709 2017-10-25 19:27:15 -07:00
Sourabh Shirhatti a7e9ed9157 Update README for 1709 2017-10-24 18:43:38 -07:00
Jinhuafei 3fcab661c6 fix NGen issue (#56) 2017-10-23 13:59:37 -07:00
Rich Lander a1eb83a881 Add Windows 1709-based 4.7.1 image (#57) 2017-10-23 12:02:08 -07:00
chiyuan ma 779317c456 Merge pull request #54 from Microsoft/dotnet471
Add .NET Framework 4.7.1 image
2017-10-18 09:00:54 -07:00
Rich Lander 1a84c94dc5 Add .NET Framework 4.7.1 Dockerfile 2017-10-09 22:50:39 -07:00
Jinhuafei b97560c5f7 Fix empty line warning (#50)
* fix empty line warning

* fix format
2017-09-12 14:02:48 -07:00
Jinhuafei 7c2e070a2f Ngen roslyn bits (#49)
* Ngen Roslyn bit and set environment variable

* remove pre-existing file/folder

* update 4.7 folder

* revert the change of the base image in 4.7 dockerfile

* inline the script in the dockerfile

* update according to CR

* clean up the code
2017-09-08 15:43:56 -07:00
Sourabh Shirhatti 01d50f202f Update tags in README
4.6.2 was accidentally called out as latest.
Fixes #46
2017-08-29 10:55:44 -07:00
Sourabh Shirhatti 64a4f91cc3 Update README.md
Update latest tags for August
2017-08-16 14:56:35 -07:00
chiyuan ma 2edf11a115 Merge pull request #41 from Microsoft/chiyma/new-servicemonitor
Update new Service Monitor
2017-07-18 11:05:13 -07:00
chiyuan ma 88f2cd29d5 Merge pull request #37 from jwalter/patch-1
Add missing dot in README.md for docker build command
2017-07-18 11:04:59 -07:00
Chiyuan Ma 45a20afcd6 Update new Service Monitor 2017-07-06 13:55:49 -07:00
jwalter 43c9dec97f Add missing dot in docker build command 2017-06-27 16:11:58 +02:00
Rich Lander acc82b2437 Update windowsservercore versions 2017-06-14 22:03:19 -07:00
Sourabh Shirhatti 9d8857bf1d Use DefaultAppPool because of new ServiceMonitor behavior 2017-06-13 16:23:51 -07:00
Richard Lander cb7a6cc0cf Update formatting 2017-06-12 13:33:48 -07:00
Richard Lander 105ac9b4dd Add new ServiceMonitor.exe
- From https://github.com/Microsoft/iis-docker/pull/41
- Updated for all three ASP.NET tags.
2017-06-12 12:37:43 -07:00
Rich Lander 86f9acc222 Update 3.5 tag to FROM dotnet-framework:3.5 2017-06-12 08:18:47 -07:00
Rich Lander 6f15ac6c51 Add support for .NET 4.7 2017-06-11 22:04:44 -07:00
Peter Hsu 7733f20fab Merge pull request #21 from Microsoft/shhsu
Added 3.5 sample
2017-01-20 14:22:37 -08:00
Peter Hsu 6c8f29654d added sample 2017-01-20 14:21:41 -08:00
Peter Hsu be2d95611b Install correct patch to .NET 3.5 image and use the right appPool for default website (#20)
Install 3.5 and patches and use correct apppool
2017-01-20 13:17:35 -08:00
Sourabh Shirhatti 365753018a Update README.md (#10) 2016-11-03 11:54:52 -07:00
Peter Hsu 37e9d5beae Merge pull request #8 from Microsoft/shhsu
Update 4.6.2 scenairo and readme file
2016-10-13 14:59:37 -07:00
Peter Hsu caa6ad6075 Update 4.6.2 scenairo and readme file 2016-10-13 12:51:07 -07:00
Sourabh Shirhatti ad2a71abb6 Add note about WinNAT (#3)
* Add note about WinNAT

* Add link to tutorial

* Use docker inspect in place of docker exec
2016-10-05 13:24:44 -04:00
Glenn Condron 9b9e14723c Update README.md
1. `--rm` and `-d` cannot be used in the same run command, invalid arguments.
2. If I follow these instructions then my site is typically in `.` as I have added a Dockerfile to the root of my project and am copying it in.
2016-10-03 14:47:23 -07:00
Rich Lander 04147c4a30 Update README.md 2016-09-30 17:47:10 -04:00
Sourabh Shirhatti 4b82606018 Update ASP.NET description 2016-09-30 13:52:36 -07:00
Sourabh Shirhatti f037f7fe29 Initial upload 2016-09-30 13:43:04 -07:00