From dfcf9e75404f83976a1f9d9247a501709627862b Mon Sep 17 00:00:00 2001 From: Bill Wagner Date: Fri, 24 Feb 2017 10:15:47 -0500 Subject: [PATCH] add docker support --- src/Web/Catalog.WebForms/Catalog.WebForms.sln | 6 +++++ .../Catalog.WebForms/.dockerignore | 3 +++ .../Catalog.WebForms/Catalog.WebForms.csproj | 6 +++++ .../Catalog.WebForms/Dockerfile | 4 ++++ .../docker-compose.ci.build.yml | 1 + .../Catalog.WebForms/docker-compose.dcproj | 22 +++++++++++++++++++ .../docker-compose.override.yml | 10 +++++++++ .../docker-compose.vs.debug.yml | 13 +++++++++++ .../docker-compose.vs.release.yml | 11 ++++++++++ src/Web/Catalog.WebForms/docker-compose.yml | 8 +++++++ 10 files changed, 84 insertions(+) create mode 100644 src/Web/Catalog.WebForms/Catalog.WebForms/.dockerignore create mode 100644 src/Web/Catalog.WebForms/Catalog.WebForms/Dockerfile create mode 100644 src/Web/Catalog.WebForms/docker-compose.ci.build.yml create mode 100644 src/Web/Catalog.WebForms/docker-compose.dcproj create mode 100644 src/Web/Catalog.WebForms/docker-compose.override.yml create mode 100644 src/Web/Catalog.WebForms/docker-compose.vs.debug.yml create mode 100644 src/Web/Catalog.WebForms/docker-compose.vs.release.yml create mode 100644 src/Web/Catalog.WebForms/docker-compose.yml diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms.sln b/src/Web/Catalog.WebForms/Catalog.WebForms.sln index 43538057e..d114cc0b0 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms.sln +++ b/src/Web/Catalog.WebForms/Catalog.WebForms.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.26223.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Catalog.WebForms", "Catalog.WebForms\Catalog.WebForms.csproj", "{07B42E24-32F8-4C10-99A8-0FB5AC6BFEBB}" EndProject +Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{7816BBB6-20B9-4D5A-864D-47B7C6E3D3D5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {07B42E24-32F8-4C10-99A8-0FB5AC6BFEBB}.Debug|Any CPU.Build.0 = Debug|Any CPU {07B42E24-32F8-4C10-99A8-0FB5AC6BFEBB}.Release|Any CPU.ActiveCfg = Release|Any CPU {07B42E24-32F8-4C10-99A8-0FB5AC6BFEBB}.Release|Any CPU.Build.0 = Release|Any CPU + {7816BBB6-20B9-4D5A-864D-47B7C6E3D3D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7816BBB6-20B9-4D5A-864D-47B7C6E3D3D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7816BBB6-20B9-4D5A-864D-47B7C6E3D3D5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7816BBB6-20B9-4D5A-864D-47B7C6E3D3D5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/.dockerignore b/src/Web/Catalog.WebForms/Catalog.WebForms/.dockerignore new file mode 100644 index 000000000..7e297f6d2 --- /dev/null +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/.dockerignore @@ -0,0 +1,3 @@ +* +!obj\Docker\publish\* +!obj\Docker\empty\ diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Catalog.WebForms.csproj b/src/Web/Catalog.WebForms/Catalog.WebForms/Catalog.WebForms.csproj index 6470bdcac..3ded0ffb1 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Catalog.WebForms.csproj +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Catalog.WebForms.csproj @@ -141,6 +141,10 @@ PreserveNewest + + + Dockerfile + @@ -213,12 +217,14 @@ Site.Mobile.Master + ASPXCodeBehind Site.Mobile.Master ViewSwitcher.ascx + ASPXCodeBehind ViewSwitcher.ascx diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Dockerfile b/src/Web/Catalog.WebForms/Catalog.WebForms/Dockerfile new file mode 100644 index 000000000..f480e8dfb --- /dev/null +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Dockerfile @@ -0,0 +1,4 @@ +FROM microsoft/aspnet +ARG source +WORKDIR /inetpub/wwwroot +COPY ${source:-obj/Docker/publish} . diff --git a/src/Web/Catalog.WebForms/docker-compose.ci.build.yml b/src/Web/Catalog.WebForms/docker-compose.ci.build.yml new file mode 100644 index 000000000..045fdea67 --- /dev/null +++ b/src/Web/Catalog.WebForms/docker-compose.ci.build.yml @@ -0,0 +1 @@ +version: '2.1' diff --git a/src/Web/Catalog.WebForms/docker-compose.dcproj b/src/Web/Catalog.WebForms/docker-compose.dcproj new file mode 100644 index 000000000..7d8443045 --- /dev/null +++ b/src/Web/Catalog.WebForms/docker-compose.dcproj @@ -0,0 +1,22 @@ + + + + 7816bbb6-20b9-4d5a-864d-47b7c6e3d3d5 + True + http://{ServiceIPAddress} + catalog.webforms + + + + + docker-compose.yml + + + docker-compose.yml + + + docker-compose.yml + + + + \ No newline at end of file diff --git a/src/Web/Catalog.WebForms/docker-compose.override.yml b/src/Web/Catalog.WebForms/docker-compose.override.yml new file mode 100644 index 000000000..8e4b77660 --- /dev/null +++ b/src/Web/Catalog.WebForms/docker-compose.override.yml @@ -0,0 +1,10 @@ +version: '2.1' + +services: + catalog.webforms: + ports: + - "80" +networks: + default: + external: + name: nat diff --git a/src/Web/Catalog.WebForms/docker-compose.vs.debug.yml b/src/Web/Catalog.WebForms/docker-compose.vs.debug.yml new file mode 100644 index 000000000..4485cb1de --- /dev/null +++ b/src/Web/Catalog.WebForms/docker-compose.vs.debug.yml @@ -0,0 +1,13 @@ +version: '2.1' + +services: + catalog.webforms: + image: catalog.webforms:dev + build: + args: + source: ${DOCKER_BUILD_SOURCE} + volumes: + - .\Catalog.WebForms:C:\inetpub\wwwroot + - ~\msvsmon:C:\msvsmon:ro + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=windows" diff --git a/src/Web/Catalog.WebForms/docker-compose.vs.release.yml b/src/Web/Catalog.WebForms/docker-compose.vs.release.yml new file mode 100644 index 000000000..37992a525 --- /dev/null +++ b/src/Web/Catalog.WebForms/docker-compose.vs.release.yml @@ -0,0 +1,11 @@ +version: '2.1' + +services: + catalog.webforms: + build: + args: + source: ${DOCKER_BUILD_SOURCE} + volumes: + - ~\msvsmon:C:\msvsmon:ro + labels: + - "com.microsoft.visualstudio.targetoperatingsystem=windows" diff --git a/src/Web/Catalog.WebForms/docker-compose.yml b/src/Web/Catalog.WebForms/docker-compose.yml new file mode 100644 index 000000000..8a5ebbe81 --- /dev/null +++ b/src/Web/Catalog.WebForms/docker-compose.yml @@ -0,0 +1,8 @@ +version: '2.1' + +services: + catalog.webforms: + image: catalog.webforms + build: + context: .\Catalog.WebForms + dockerfile: Dockerfile