From 91f224f05265412ba718640da131680a24139e42 Mon Sep 17 00:00:00 2001 From: Benjamin Moles Date: Sun, 25 Mar 2018 20:44:51 +0200 Subject: [PATCH 1/8] Initial solution with a default Sitecore running (known issue: IIS needs to be manually started) --- sitecore/9.0.1 rev. 171219 XM1/.gitattributes | 63 +++ sitecore/9.0.1 rev. 171219 XM1/.gitignore | 271 +++++++++ sitecore/9.0.1 rev. 171219 XM1/Website.sln | 59 ++ .../Website/.dockerignore | 4 + .../9.0.1 rev. 171219 XM1/Website/Dockerfile | 6 + .../9.0.1 rev. 171219 XM1/Website/Global.asax | 3 + .../Website/Global.asax.cs | 17 + .../Website/Properties/AssemblyInfo.cs | 35 ++ .../Website/Views/web.config | 60 ++ .../Website/Web.Debug.config | 31 ++ .../Website/Web.Release.config | 31 ++ .../9.0.1 rev. 171219 XM1/Website/Web.config | 518 ++++++++++++++++++ .../Website/Website.csproj | 169 ++++++ .../Website/build.Dockerfile | 6 + .../Website/packages.config | 11 + .../docker-compose.dcproj | 23 + .../docker-compose.override.yml | 26 + .../docker-compose.vs.debug.yml | 10 + .../docker-compose.vs.release.yml | 10 + .../9.0.1 rev. 171219 XM1/docker-compose.yml | 7 + .../storage/Data/README.md | 3 + .../storage/Databases/README.md | 3 + .../storage/Solr/README.md | 3 + .../storage/Website/README.md | 5 + 24 files changed, 1374 insertions(+) create mode 100644 sitecore/9.0.1 rev. 171219 XM1/.gitattributes create mode 100644 sitecore/9.0.1 rev. 171219 XM1/.gitignore create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website.sln create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/.dockerignore create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/Dockerfile create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/Global.asax create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/Global.asax.cs create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/Properties/AssemblyInfo.cs create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/Views/web.config create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/Web.Debug.config create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/Web.Release.config create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/Web.config create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/Website.csproj create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/build.Dockerfile create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/packages.config create mode 100644 sitecore/9.0.1 rev. 171219 XM1/docker-compose.dcproj create mode 100644 sitecore/9.0.1 rev. 171219 XM1/docker-compose.override.yml create mode 100644 sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.debug.yml create mode 100644 sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.release.yml create mode 100644 sitecore/9.0.1 rev. 171219 XM1/docker-compose.yml create mode 100644 sitecore/9.0.1 rev. 171219 XM1/storage/Data/README.md create mode 100644 sitecore/9.0.1 rev. 171219 XM1/storage/Databases/README.md create mode 100644 sitecore/9.0.1 rev. 171219 XM1/storage/Solr/README.md create mode 100644 sitecore/9.0.1 rev. 171219 XM1/storage/Website/README.md diff --git a/sitecore/9.0.1 rev. 171219 XM1/.gitattributes b/sitecore/9.0.1 rev. 171219 XM1/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/sitecore/9.0.1 rev. 171219 XM1/.gitignore b/sitecore/9.0.1 rev. 171219 XM1/.gitignore new file mode 100644 index 0000000..a30d3dc --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/.gitignore @@ -0,0 +1,271 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]uild/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ +project.lock.json + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +project.fragment.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.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 + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +*.ncrunchproject +*.ncrunchsolution +.*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 +# TODO: 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 +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignoreable 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 + +# 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/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# 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 + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# 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/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Sitecore +*.zip +license.xml +/storage/ diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website.sln b/sitecore/9.0.1 rev. 171219 XM1/Website.sln new file mode 100644 index 0000000..6956307 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website.sln @@ -0,0 +1,59 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2003 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Website", "Website\Website.csproj", "{79DEFC18-4A83-4636-A63E-58FCB1F7CE43}" +EndProject +Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{5AE1F824-9AC2-4D3F-9B06-96F2581A706F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "storage", "storage", "{6B9849DF-0E4C-4894-90AB-6F3AC8B5557F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{40803415-42EE-42BA-A8D9-D3FEEC2FF721}" + ProjectSection(SolutionItems) = preProject + storage\Data\README.md = storage\Data\README.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Databases", "Databases", "{353A6BDC-3DAA-42E7-A510-B6ED9C0740A2}" + ProjectSection(SolutionItems) = preProject + storage\Databases\README.md = storage\Databases\README.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Website", "Website", "{697F8E02-69E2-4169-9E27-2F9FDAE3F9F5}" + ProjectSection(SolutionItems) = preProject + storage\Website\README.md = storage\Website\README.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solr", "Solr", "{44091F75-6CE0-4762-BC77-C43F0395AB27}" + ProjectSection(SolutionItems) = preProject + storage\Solr\README.md = storage\Solr\README.md + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {79DEFC18-4A83-4636-A63E-58FCB1F7CE43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {79DEFC18-4A83-4636-A63E-58FCB1F7CE43}.Debug|Any CPU.Build.0 = Debug|Any CPU + {79DEFC18-4A83-4636-A63E-58FCB1F7CE43}.Release|Any CPU.ActiveCfg = Release|Any CPU + {79DEFC18-4A83-4636-A63E-58FCB1F7CE43}.Release|Any CPU.Build.0 = Release|Any CPU + {5AE1F824-9AC2-4D3F-9B06-96F2581A706F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5AE1F824-9AC2-4D3F-9B06-96F2581A706F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5AE1F824-9AC2-4D3F-9B06-96F2581A706F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5AE1F824-9AC2-4D3F-9B06-96F2581A706F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {40803415-42EE-42BA-A8D9-D3FEEC2FF721} = {6B9849DF-0E4C-4894-90AB-6F3AC8B5557F} + {353A6BDC-3DAA-42E7-A510-B6ED9C0740A2} = {6B9849DF-0E4C-4894-90AB-6F3AC8B5557F} + {697F8E02-69E2-4169-9E27-2F9FDAE3F9F5} = {6B9849DF-0E4C-4894-90AB-6F3AC8B5557F} + {44091F75-6CE0-4762-BC77-C43F0395AB27} = {6B9849DF-0E4C-4894-90AB-6F3AC8B5557F} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {001F830D-D261-470B-8325-98DD4437909C} + EndGlobalSection +EndGlobal diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/.dockerignore b/sitecore/9.0.1 rev. 171219 XM1/Website/.dockerignore new file mode 100644 index 0000000..78dc13f --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/.dockerignore @@ -0,0 +1,4 @@ +obj +*.cs +!obj\Docker\publish\* +!obj\Docker\empty\ diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Dockerfile b/sitecore/9.0.1 rev. 171219 XM1/Website/Dockerfile new file mode 100644 index 0000000..d3ac34e --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/Dockerfile @@ -0,0 +1,6 @@ +# escape=` + +FROM VSWebsiteRegistry.azurecr.io/sitecore:9.0.171219-xm1-cm +ARG source +WORKDIR ${SITEPATH} +COPY ${source:-obj/Docker/empty} . diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Global.asax b/sitecore/9.0.1 rev. 171219 XM1/Website/Global.asax new file mode 100644 index 0000000..4400a09 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/Global.asax @@ -0,0 +1,3 @@ +<%@Application Language='C#' Inherits="Sitecore.Web.Application" %> + +<%-- WARNING: Every custom application must derive from the Sitecore.Web.Application class. Otherwise some Sitecore features will not be available or will not work correctly. --%> diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Global.asax.cs b/sitecore/9.0.1 rev. 171219 XM1/Website/Global.asax.cs new file mode 100644 index 0000000..6204751 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/Global.asax.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; +using System.Web.Routing; + +namespace Website +{ + public class MvcApplication : System.Web.HttpApplication + { + protected void Application_Start() + { + AreaRegistration.RegisterAllAreas(); + } + } +} diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Properties/AssemblyInfo.cs b/sitecore/9.0.1 rev. 171219 XM1/Website/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..8ac8481 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/Properties/AssemblyInfo.cs @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Website")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Website")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("79defc18-4a83-4636-a63e-58fcb1f7ce43")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Views/web.config b/sitecore/9.0.1 rev. 171219 XM1/Website/Views/web.config new file mode 100644 index 0000000..dab8003 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/Views/web.config @@ -0,0 +1,60 @@ + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Web.Debug.config b/sitecore/9.0.1 rev. 171219 XM1/Website/Web.Debug.config new file mode 100644 index 0000000..0e3d47b --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/Web.Debug.config @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Web.Release.config b/sitecore/9.0.1 rev. 171219 XM1/Website/Web.Release.config new file mode 100644 index 0000000..da6e960 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/Web.Release.config @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Web.config b/sitecore/9.0.1 rev. 171219 XM1/Website/Web.config new file mode 100644 index 0000000..71e7f4e --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/Web.config @@ -0,0 +1,518 @@ + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Website.csproj b/sitecore/9.0.1 rev. 171219 XM1/Website/Website.csproj new file mode 100644 index 0000000..d63f5cb --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/Website.csproj @@ -0,0 +1,169 @@ + + + + + + Debug + AnyCPU + + + 2.0 + {79DEFC18-4A83-4636-A63E-58FCB1F7CE43} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + Website + Website + v4.6.2 + true + + + + + + + + + ..\docker-compose.dcproj + + + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + true + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + + + ..\packages\Sitecore.Kernel.NoReferences.9.0.171219\lib\NET462\Sitecore.Kernel.dll + + + ..\packages\Sitecore.Mvc.NoReferences.9.0.171219\lib\NET462\Sitecore.Mvc.dll + + + + + + + + + + + + + + + + + + + + ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + + + ..\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Webpages.dll + + + ..\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Webpages.Deployment.dll + + + ..\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Webpages.Razor.dll + + + ..\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Helpers.dll + + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + + + + + + + + Global.asax + + + + + + + + Dockerfile + + + Dockerfile + + + + Web.config + + + Web.config + + + + + + + + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + + + + + True + True + 2656 + / + http://localhost:2656/ + False + False + + + False + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + \ No newline at end of file diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/build.Dockerfile b/sitecore/9.0.1 rev. 171219 XM1/Website/build.Dockerfile new file mode 100644 index 0000000..ea6bbe8 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/build.Dockerfile @@ -0,0 +1,6 @@ +# escape=` + +FROM VSWebsiteRegistry.azurecr.io/sitecore:9.0.171219-xm1-cm +ARG source +WORKDIR ${SITEPATH} +COPY ${source:-obj/Docker/publish} . diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/packages.config b/sitecore/9.0.1 rev. 171219 XM1/Website/packages.config new file mode 100644 index 0000000..6c6bb66 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/packages.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/sitecore/9.0.1 rev. 171219 XM1/docker-compose.dcproj b/sitecore/9.0.1 rev. 171219 XM1/docker-compose.dcproj new file mode 100644 index 0000000..342b9cc --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/docker-compose.dcproj @@ -0,0 +1,23 @@ + + + + 2.0 + Windows + 5ae1f824-9ac2-4d3f-9b06-96f2581a706f + True + http://{ServiceIPAddress} + website + + + + docker-compose.yml + + + docker-compose.yml + + + docker-compose.yml + + + + \ No newline at end of file diff --git a/sitecore/9.0.1 rev. 171219 XM1/docker-compose.override.yml b/sitecore/9.0.1 rev. 171219 XM1/docker-compose.override.yml new file mode 100644 index 0000000..9831026 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/docker-compose.override.yml @@ -0,0 +1,26 @@ +version: '3' + +services: + sql: + image: VSWebsiteRegistry.azurecr.io/sitecore:9.0.171219-sql + volumes: + - .\storage\Databases:C:\Data + environment: + sa_password: HASH-epsom-sunset-cost7! + solr: + image: VSWebsiteRegistry.azurecr.io/sitecore:9.0.171219-solr + volumes: + - .\storage\Solr:C:\Data + website: + ports: + - "80" + volumes: + - .\storage\Data:C:\inetpub\sc\Data + links: + - sql + - solr + +networks: + default: + external: + name: nat diff --git a/sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.debug.yml b/sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.debug.yml new file mode 100644 index 0000000..b60ef4c --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.debug.yml @@ -0,0 +1,10 @@ +version: '3' + +services: + website: + build: + dockerfile: Dockerfile + args: + source: obj/Docker/empty +# volumes: +# - .\storage\Website\:C:\inetpub\${SITENAME} diff --git a/sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.release.yml b/sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.release.yml new file mode 100644 index 0000000..1226799 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.release.yml @@ -0,0 +1,10 @@ +version: '3' + +services: + website: + build: + dockerfile: build.Dockerfile + args: + source: obj/Docker/publish +# volumes: +# - .\storage\Website\:C:\inetpub\${SITENAME} diff --git a/sitecore/9.0.1 rev. 171219 XM1/docker-compose.yml b/sitecore/9.0.1 rev. 171219 XM1/docker-compose.yml new file mode 100644 index 0000000..c3147b9 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/docker-compose.yml @@ -0,0 +1,7 @@ +version: '3' + +services: + website: + build: + context: .\Website + dockerfile: Dockerfile diff --git a/sitecore/9.0.1 rev. 171219 XM1/storage/Data/README.md b/sitecore/9.0.1 rev. 171219 XM1/storage/Data/README.md new file mode 100644 index 0000000..aa74a7c --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/storage/Data/README.md @@ -0,0 +1,3 @@ +This folder will contain Sitecore's Data folder. +All Sitecore logs, packages and other resources stored by Sitecore will be persisted in this folder +Place Sitecore "**license.xml**" file here. \ No newline at end of file diff --git a/sitecore/9.0.1 rev. 171219 XM1/storage/Databases/README.md b/sitecore/9.0.1 rev. 171219 XM1/storage/Databases/README.md new file mode 100644 index 0000000..24f8a00 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/storage/Databases/README.md @@ -0,0 +1,3 @@ +This folder will contain the SQL databases required by Sitecore. +If databases are added manually Sitecore will use them. Otherwise, the Sitecore Docker image will add the default databases. +Please notice that Sitecore images will populate this folder with default databases only if the folder has no databases (files with "*.mdf" extension). \ No newline at end of file diff --git a/sitecore/9.0.1 rev. 171219 XM1/storage/Solr/README.md b/sitecore/9.0.1 rev. 171219 XM1/storage/Solr/README.md new file mode 100644 index 0000000..974d794 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/storage/Solr/README.md @@ -0,0 +1,3 @@ +This folder will contain the Solr cores (indexes) required by Sitecore. +If cores are added manually Sitecore will use them. Otherwise, Sitecore Docker images will add the default cores. +Please notice that Sitecore images will populate this folder with default indexes only if the folder has no cores (items which name starts with "sc_") or the file "solr.xml" is missing in the folder. diff --git a/sitecore/9.0.1 rev. 171219 XM1/storage/Website/README.md b/sitecore/9.0.1 rev. 171219 XM1/storage/Website/README.md new file mode 100644 index 0000000..9714373 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/storage/Website/README.md @@ -0,0 +1,5 @@ +Place here the Sitecore "Website" folder content from the required version. + +This folder will be linked with the container while debugging. Changes to the folder will immediately be detected by Sitecore within the container. + +It is expected that tools such as TDS can work with this folder as if the site was running locally. \ No newline at end of file From 3adb8699b7f80184582deee574f313744285b19c Mon Sep 17 00:00:00 2001 From: Benjamin Moles Date: Mon, 26 Mar 2018 22:49:30 +0200 Subject: [PATCH 2/8] Add support to work with local Website folder at debug time --- .../Website/.dockerignore | 6 ++--- .../Website/DebugBoot.ps1 | 26 +++++++++++++++++++ .../9.0.1 rev. 171219 XM1/Website/Dockerfile | 13 +++++++++- .../Website/Website.csproj | 1 + .../Website/build.Dockerfile | 4 ++- .../docker-compose.vs.debug.yml | 5 ++-- 6 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 sitecore/9.0.1 rev. 171219 XM1/Website/DebugBoot.ps1 diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/.dockerignore b/sitecore/9.0.1 rev. 171219 XM1/Website/.dockerignore index 78dc13f..bea11a4 100644 --- a/sitecore/9.0.1 rev. 171219 XM1/Website/.dockerignore +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/.dockerignore @@ -1,4 +1,4 @@ -obj -*.cs -!obj\Docker\publish\* +* +!DebugBoot.ps1 +!obj\Docker\publish\ !obj\Docker\empty\ diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/DebugBoot.ps1 b/sitecore/9.0.1 rev. 171219 XM1/Website/DebugBoot.ps1 new file mode 100644 index 0000000..c542fb1 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/DebugBoot.ps1 @@ -0,0 +1,26 @@ +if ((Test-Path 'env:\DEFAULTWEBSITEPATH') -And (Test-Path 'env:\SITEPATH')){ + + [string]$DefaultWebsitePath = $env:DEFAULTWEBSITEPATH + '\*' + if (-Not (Test-Path $DefaultWebsitePath)){ + Write-Host "### '$DefaultWebsitePath' is not valid." + Exit + } + [string]$WebsitePath = $env:SITEPATH + if (-Not (Test-Path $WebsitePath -PathType 'Container')){ + Write-Host "### '$WebsitePath' is not valid." + Exit + } + + $noSitecoreFiles = ((Get-ChildItem -Path $WebsitePath -Filter "Web.config") -eq $null -or (Get-ChildItem -Path ("{0}\sitecore\service" -f $WebsitePath) -Filter "Heartbeat.aspx") -eq $null) + + if ($noSitecoreFiles) + { + Write-Host "### Sitecore files not found in '$WebsitePath', seeding clean Website ..." + + Copy-Item -Path $DefaultWebsitePath -Destination $WebsitePath -Force -Recurse + } + else + { + Write-Host "### Existing Sitecore files found in '$WebsitePath'..." + } +} diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Dockerfile b/sitecore/9.0.1 rev. 171219 XM1/Website/Dockerfile index d3ac34e..49c18c1 100644 --- a/sitecore/9.0.1 rev. 171219 XM1/Website/Dockerfile +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/Dockerfile @@ -2,5 +2,16 @@ FROM VSWebsiteRegistry.azurecr.io/sitecore:9.0.171219-xm1-cm ARG source + +ENV DEFAULTWEBSITENAME='__DefaultWebsite' +ENV DEFAULTWEBSITEPATH=${SITEPATH}\..\${DEFAULTWEBSITENAME} + +RUN Rename-Item -Path $env:SITEPATH -NewName $env:DEFAULTWEBSITENAME; ` + New-Item -Path $env:SITEPATH -ItemType Directory | Out-Null; + +VOLUME ${SITEPATH} + +COPY DebugBoot.ps1 . +COPY ${source:-obj/Docker/empty} ${SITEPATH} + WORKDIR ${SITEPATH} -COPY ${source:-obj/Docker/empty} . diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Website.csproj b/sitecore/9.0.1 rev. 171219 XM1/Website/Website.csproj index d63f5cb..57f058e 100644 --- a/sitecore/9.0.1 rev. 171219 XM1/Website/Website.csproj +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/Website.csproj @@ -107,6 +107,7 @@ + Dockerfile diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/build.Dockerfile b/sitecore/9.0.1 rev. 171219 XM1/Website/build.Dockerfile index ea6bbe8..3f87a9d 100644 --- a/sitecore/9.0.1 rev. 171219 XM1/Website/build.Dockerfile +++ b/sitecore/9.0.1 rev. 171219 XM1/Website/build.Dockerfile @@ -2,5 +2,7 @@ FROM VSWebsiteRegistry.azurecr.io/sitecore:9.0.171219-xm1-cm ARG source + +COPY ${source:-obj/Docker/publish} ${SITEPATH} + WORKDIR ${SITEPATH} -COPY ${source:-obj/Docker/publish} . diff --git a/sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.debug.yml b/sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.debug.yml index b60ef4c..0b673d4 100644 --- a/sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.debug.yml +++ b/sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.debug.yml @@ -6,5 +6,6 @@ services: dockerfile: Dockerfile args: source: obj/Docker/empty -# volumes: -# - .\storage\Website\:C:\inetpub\${SITENAME} + volumes: + - .\storage\Website\:C:\inetpub\sc\website + entrypoint: powershell -Command "C:/DebugBoot.ps1;C:/remote_debugger/x64/msvsmon.exe /noauth /anyuser /silent /nostatus /noclrwarn /nosecuritywarn /nofirewallwarn /nowowwarn /timeout:2147483646;C:/ServiceMonitor.exe w3svc;" From fa2786fc83fe7790132a46e292f53625d4ef334a Mon Sep 17 00:00:00 2001 From: Benjamin Moles Date: Tue, 27 Mar 2018 11:09:38 +0000 Subject: [PATCH 3/8] Add initial README draft (not finished) --- sitecore/9.0.1 rev. 171219 XM1/README.md | 55 ++++++++++++++++++++++ sitecore/9.0.1 rev. 171219 XM1/Website.sln | 7 ++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 sitecore/9.0.1 rev. 171219 XM1/README.md diff --git a/sitecore/9.0.1 rev. 171219 XM1/README.md b/sitecore/9.0.1 rev. 171219 XM1/README.md new file mode 100644 index 0000000..0fee3e0 --- /dev/null +++ b/sitecore/9.0.1 rev. 171219 XM1/README.md @@ -0,0 +1,55 @@ +# docker-demo for Sitecore 9.0.1 rev. 171219 XM1 + +This demo showcases how to create a VS2017 project for Sitecore with the following features: + +1. Website folder as volume with files stored in the development machine, at debugging time (no need for synchronization) +1. Website folder embedded in the image at runtime. +1. Website folder files, databases and Solr cores are automatically copied from the images to the Development environment (if missing) (same as databases). +1. Attach to IIS process in the container from VS2017 for debugging + +## Prerequisites + +* Windows 10 Fall Creators Update +* Docker for Windows +* Visual Studio 2017 15.5 or later + +## Development Environment Setup + +1. Clone [this repository](https://github.com/Ben-m-s/Sitecore82TDS.git) into a folder such as “C:\Docker\Sitecore82TDS” (next steps will asume this folder has been used): +1. Copy "**Sitecore 8.2 rev. 161221.zip**" into “c:\Docker\Sitecore82TDS\\**images\sitecore-82rev161221**“ +1. Copy "**license.xml**" into "c:\Docker\Sitecore82TDS\\**storage\Data**“ +1. Copy the database files (*.mdf and *.ldf) from "**Sitecore 8.2 rev. 161221.zip**" into "c:\Docker\Sitecore82TDS\\**storage\Databases**“ +1. Copy The "Website" folder files from "**Sitecore 8.2 rev. 161221.zip**" into "c:\Docker\Sitecore82TDS\\**storage\Website**“ +1. Open VS2017 as Administrator +1. Open the solution “c:\Docker\Sitecore82TDS\\**Sitecore82TDS.sln**” +1. Open a PowerShell console as Administrator. +1. Build base images by running the folliwing PowerShell script: + ```text + .\Build.ps1 + ``` +1. Copy file “c:\Docker\Sitecore82TDS\src\Website\Properties\PublishProfiles\\**LocalDevContainer.pubxml.example**” as “**LocalDevContainer.pubxml**” +1. Edit the Publication settings "**LocalDevContainer**" for the project “Website”. Set the Target Location to “C:\Docker\Sitecore82TDS\\**storage\website**” +1. Build the solution. +1. Publish the Website project to the local folder "c:\Docker\Sitecore82TDS\\**storage\Website**“ +1. Make sure the project “**docker-compose**” is set as StartUp project +1. Run the containers with “**Debug**” configuration. The browser will open with Sitecore’s home page. +1. Copy the container’s IP in the “c:\Windows\System32\drivers\etc\\**hosts**” file with the URL: **sitecore82tds.dev.local** +1. With VS2017, edit the properties of the TDS project “**SampleSite.Master**”. + 1. Select tab “**Build**” + 1. Check the checkbox “**Edit user specific configuration (.user file)**” + 1. Set the following values in the text boxes: + 1. Sitecore Web Url: “http://sitecore82tds.dev.local” + 1. Sitecore Deploy Folder: "c:\Docker\Sitecore82TDS\storage\Website“ + 1. Check the checkbox “**Install Sitecore Connector**”. A guid should appear in the “Sitecore Access Guid” field + 1. Click the “**Test**” button to confirm the connection works + 1. Save the project. +1. Deploy the TDS project “**SampleSite.Master**” +1. Browse to “http://sitecore82tds.dev.local/sitecore/shell” +1. Login with “admin” and “b” +1. Browse to “**/sitecore/content/Home**”. Confirm there is a child page deployed by TDS. + + +## Known issues + +1. Visual Studio fails when trying to attach just after starting debugging session. VS can attach to the running process in container afterwards, though. + diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website.sln b/sitecore/9.0.1 rev. 171219 XM1/Website.sln index 6956307..527371b 100644 --- a/sitecore/9.0.1 rev. 171219 XM1/Website.sln +++ b/sitecore/9.0.1 rev. 171219 XM1/Website.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.2003 +VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Website", "Website\Website.csproj", "{79DEFC18-4A83-4636-A63E-58FCB1F7CE43}" EndProject @@ -29,6 +29,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solr", "Solr", "{44091F75-6 storage\Solr\README.md = storage\Solr\README.md EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A5199492-11C6-4DC2-8F62-543B7FE6C43A}" + ProjectSection(SolutionItems) = preProject + README.md = README.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU From 19f6cd4dd7b7f632e244f8e63031ce98c9cc78ff Mon Sep 17 00:00:00 2001 From: Benjamin Moles Date: Tue, 27 Mar 2018 11:18:31 +0000 Subject: [PATCH 4/8] Change folder structure as agreed in Slack --- .../9.0.1 rev. 171219 XM1/{ => VS2017/Website}/.gitattributes | 0 sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/.gitignore | 0 sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website.sln | 0 .../{ => VS2017/Website}/Website/.dockerignore | 0 .../{ => VS2017/Website}/Website/DebugBoot.ps1 | 0 .../9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/Dockerfile | 0 .../{ => VS2017/Website}/Website/Global.asax | 0 .../{ => VS2017/Website}/Website/Global.asax.cs | 0 .../{ => VS2017/Website}/Website/Properties/AssemblyInfo.cs | 0 .../{ => VS2017/Website}/Website/Views/web.config | 0 .../{ => VS2017/Website}/Website/Web.Debug.config | 0 .../{ => VS2017/Website}/Website/Web.Release.config | 0 .../9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/Web.config | 0 .../{ => VS2017/Website}/Website/Website.csproj | 0 .../{ => VS2017/Website}/Website/build.Dockerfile | 0 .../{ => VS2017/Website}/Website/packages.config | 0 .../{ => VS2017/Website}/docker-compose.dcproj | 0 .../{ => VS2017/Website}/docker-compose.override.yml | 0 .../{ => VS2017/Website}/docker-compose.vs.debug.yml | 0 .../{ => VS2017/Website}/docker-compose.vs.release.yml | 0 .../9.0.1 rev. 171219 XM1/{ => VS2017/Website}/docker-compose.yml | 0 .../{ => VS2017/Website}/storage/Data/README.md | 0 .../{ => VS2017/Website}/storage/Databases/README.md | 0 .../{ => VS2017/Website}/storage/Solr/README.md | 0 .../{ => VS2017/Website}/storage/Website/README.md | 0 25 files changed, 0 insertions(+), 0 deletions(-) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/.gitattributes (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/.gitignore (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website.sln (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/.dockerignore (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/DebugBoot.ps1 (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/Dockerfile (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/Global.asax (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/Global.asax.cs (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/Properties/AssemblyInfo.cs (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/Views/web.config (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/Web.Debug.config (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/Web.Release.config (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/Web.config (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/Website.csproj (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/build.Dockerfile (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/Website/packages.config (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/docker-compose.dcproj (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/docker-compose.override.yml (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/docker-compose.vs.debug.yml (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/docker-compose.vs.release.yml (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/docker-compose.yml (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/storage/Data/README.md (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/storage/Databases/README.md (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/storage/Solr/README.md (100%) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/storage/Website/README.md (100%) diff --git a/sitecore/9.0.1 rev. 171219 XM1/.gitattributes b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/.gitattributes similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/.gitattributes rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/.gitattributes diff --git a/sitecore/9.0.1 rev. 171219 XM1/.gitignore b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/.gitignore similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/.gitignore rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/.gitignore diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website.sln b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website.sln similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website.sln rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website.sln diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/.dockerignore b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/.dockerignore similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/.dockerignore rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/.dockerignore diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/DebugBoot.ps1 b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/DebugBoot.ps1 similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/DebugBoot.ps1 rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/DebugBoot.ps1 diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Dockerfile b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Dockerfile similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/Dockerfile rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Dockerfile diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Global.asax b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Global.asax similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/Global.asax rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Global.asax diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Global.asax.cs b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Global.asax.cs similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/Global.asax.cs rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Global.asax.cs diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Properties/AssemblyInfo.cs b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Properties/AssemblyInfo.cs similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/Properties/AssemblyInfo.cs rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Properties/AssemblyInfo.cs diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Views/web.config b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Views/web.config similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/Views/web.config rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Views/web.config diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Web.Debug.config b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Web.Debug.config similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/Web.Debug.config rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Web.Debug.config diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Web.Release.config b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Web.Release.config similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/Web.Release.config rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Web.Release.config diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Web.config b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Web.config similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/Web.config rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Web.config diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/Website.csproj b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Website.csproj similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/Website.csproj rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Website.csproj diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/build.Dockerfile b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/build.Dockerfile similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/build.Dockerfile rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/build.Dockerfile diff --git a/sitecore/9.0.1 rev. 171219 XM1/Website/packages.config b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/packages.config similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/Website/packages.config rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/packages.config diff --git a/sitecore/9.0.1 rev. 171219 XM1/docker-compose.dcproj b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.dcproj similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/docker-compose.dcproj rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.dcproj diff --git a/sitecore/9.0.1 rev. 171219 XM1/docker-compose.override.yml b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.override.yml similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/docker-compose.override.yml rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.override.yml diff --git a/sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.debug.yml b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.vs.debug.yml similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.debug.yml rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.vs.debug.yml diff --git a/sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.release.yml b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.vs.release.yml similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/docker-compose.vs.release.yml rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.vs.release.yml diff --git a/sitecore/9.0.1 rev. 171219 XM1/docker-compose.yml b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.yml similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/docker-compose.yml rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.yml diff --git a/sitecore/9.0.1 rev. 171219 XM1/storage/Data/README.md b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Data/README.md similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/storage/Data/README.md rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Data/README.md diff --git a/sitecore/9.0.1 rev. 171219 XM1/storage/Databases/README.md b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Databases/README.md similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/storage/Databases/README.md rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Databases/README.md diff --git a/sitecore/9.0.1 rev. 171219 XM1/storage/Solr/README.md b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Solr/README.md similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/storage/Solr/README.md rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Solr/README.md diff --git a/sitecore/9.0.1 rev. 171219 XM1/storage/Website/README.md b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Website/README.md similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/storage/Website/README.md rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Website/README.md From fdd963d89295e5e7364d630863ce735e1aead8d8 Mon Sep 17 00:00:00 2001 From: Benjamin Moles Date: Tue, 27 Mar 2018 11:28:09 +0000 Subject: [PATCH 5/8] Relocate README.md file where it should be --- sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sitecore/9.0.1 rev. 171219 XM1/{ => VS2017/Website}/README.md (100%) diff --git a/sitecore/9.0.1 rev. 171219 XM1/README.md b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/README.md rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md From 20c09096cb114136f1432845ea17bd3675aaf0c9 Mon Sep 17 00:00:00 2001 From: Benjamin Moles Date: Tue, 27 Mar 2018 22:26:34 +0200 Subject: [PATCH 6/8] Finish, by now, the documentation --- .../VS2017/Website/README.md | 108 +++++++++++++----- 1 file changed, 77 insertions(+), 31 deletions(-) diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md index 0fee3e0..eb74f75 100644 --- a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md +++ b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md @@ -12,44 +12,90 @@ This demo showcases how to create a VS2017 project for Sitecore with the followi * Windows 10 Fall Creators Update * Docker for Windows * Visual Studio 2017 15.5 or later +* Clone the [Sitecore base docker-images repository](https://github.com/Sitecore/docker-images) and build the images for the Sitecore version "9.0.1 rev. 171219 XM1 CM". ## Development Environment Setup -1. Clone [this repository](https://github.com/Ben-m-s/Sitecore82TDS.git) into a folder such as “C:\Docker\Sitecore82TDS” (next steps will asume this folder has been used): -1. Copy "**Sitecore 8.2 rev. 161221.zip**" into “c:\Docker\Sitecore82TDS\\**images\sitecore-82rev161221**“ -1. Copy "**license.xml**" into "c:\Docker\Sitecore82TDS\\**storage\Data**“ -1. Copy the database files (*.mdf and *.ldf) from "**Sitecore 8.2 rev. 161221.zip**" into "c:\Docker\Sitecore82TDS\\**storage\Databases**“ -1. Copy The "Website" folder files from "**Sitecore 8.2 rev. 161221.zip**" into "c:\Docker\Sitecore82TDS\\**storage\Website**“ +1. Clone [this repository](https://github.com/Ben-m-s/docker-demo) into a folder such as “c:\Docker\Sitecore\docker-demo” (next steps will asume this folder has been used): +1. Copy "**license.xml**" into "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**storage\Data**“ 1. Open VS2017 as Administrator -1. Open the solution “c:\Docker\Sitecore82TDS\\**Sitecore82TDS.sln**” -1. Open a PowerShell console as Administrator. -1. Build base images by running the folliwing PowerShell script: - ```text - .\Build.ps1 - ``` -1. Copy file “c:\Docker\Sitecore82TDS\src\Website\Properties\PublishProfiles\\**LocalDevContainer.pubxml.example**” as “**LocalDevContainer.pubxml**” -1. Edit the Publication settings "**LocalDevContainer**" for the project “Website”. Set the Target Location to “C:\Docker\Sitecore82TDS\\**storage\website**” -1. Build the solution. -1. Publish the Website project to the local folder "c:\Docker\Sitecore82TDS\\**storage\Website**“ +1. Open the solution “C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**Website.sln**” 1. Make sure the project “**docker-compose**” is set as StartUp project -1. Run the containers with “**Debug**” configuration. The browser will open with Sitecore’s home page. -1. Copy the container’s IP in the “c:\Windows\System32\drivers\etc\\**hosts**” file with the URL: **sitecore82tds.dev.local** -1. With VS2017, edit the properties of the TDS project “**SampleSite.Master**”. - 1. Select tab “**Build**” - 1. Check the checkbox “**Edit user specific configuration (.user file)**” - 1. Set the following values in the text boxes: - 1. Sitecore Web Url: “http://sitecore82tds.dev.local” - 1. Sitecore Deploy Folder: "c:\Docker\Sitecore82TDS\storage\Website“ - 1. Check the checkbox “**Install Sitecore Connector**”. A guid should appear in the “Sitecore Access Guid” field - 1. Click the “**Test**” button to confirm the connection works - 1. Save the project. -1. Deploy the TDS project “**SampleSite.Master**” -1. Browse to “http://sitecore82tds.dev.local/sitecore/shell” -1. Login with “admin” and “b” -1. Browse to “**/sitecore/content/Home**”. Confirm there is a child page deployed by TDS. +1. Build the solution. The two projects in the solution should compile. +1. Build the solution with “**Debug**” configuration ("F5"). + >The first time the containers run, the base images will detect that the required assets (databases, indexes and site files) are missing in their respected VOLUMEs (pointing to the development environment) and will take some time to create them. VS will build the containers and will try to attach to the IIS's process running in website's container, however it will fail (TODO: fix this known issue). In the meantime, the file transfer from the images to the Development environment will keep progresing. Please be patient. +1. Copy the website's container’s IP from the VS' "Output" panel (make sure it is the "Docker" output) and paste the IP on a browser's address bar. Please notice that Sitecore needs some time to warm-up, therefore the initial start may take a bit (up to 1-2 min). +1. The browser will display the OOTB Sitecore’s home page. +1. Any change made to the following folder will be automatically detected by sitecore + "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**storage\Website**“ +## Development Process + +Sitecore supports multiple sites and also multiple URL for each site. It may be necessary to access the site with a specific URL (other than the IP). In these cases, it is necessary to update the development environment's host file every time the container is run (instantiated), which happens the first time VS runs the project. + +Following the initial container run, the container can remain running meanwhile changes are done to the website and published to the following folder through the standard VS publishing feature (as if the container was an IIS instance running locally). + "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**storage\Website**“ + +## Debugging Sitecore with VS2017 + +### Attaching VS2017 to Sitecore + +The following steps describes how to attach VS2017 to the IIS process where Sitecore is running within its container. + +1. Make sure Sitecore is running by browising to its IP which can be obtained with either of the following procedures: + 1. Through VS2017 + 1. When VS2017 runs a docker project (it must be selected as StartUp project) the website container's IP is displayed in the "Output" panel ("Docker" output). There should be as below example: + ```text + ========== Debugging ========== + docker ps --filter "status=running" --filter "name=dockercompose14165912220825680628_website_" --format {{.ID}} -n 1 + ac58646e9013 + docker inspect --format="{{range .NetworkSettings.Networks}}{{.IPAddress}} {{end}}" ac58646e9013 + 172.22.99.92 + ``` + * Notice that the "**ac58646e9013**" is the container id. It is different every time the container is created + * The following instruction is used to get the container's IP. Notice the container ID at the end. + ```text + docker inspect --format="{{range .NetworkSettings.Networks}}{{.IPAddress}} {{end}}" ac58646e9013 + ``` + * Finally the last line is the container's IP which also changes every time the container is run. + 1. Through a console + 1. Get the container's ID: + ```text + PS C:\> docker ps -a + CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES + ac58646e9013 website:dev "powershell -Command…" About an hour ago Up About an hour 0.0.0.0:37434->80/tcp dockercompose14165912220825680628_website_1 + 984cdde5faee VSWebsiteRegistry.azurecr.io/sitecore:9.0.171219-sql "powershell -Command…" About an hour ago Up About an hour (healthy) dockercompose14165912220825680628_sql_1 + da78adba6ac0 VSWebsiteRegistry.azurecr.io/sitecore:9.0.171219-solr "powershell -Command…" About an hour ago Up About an hour 8983/tcp dockercompose14165912220825680628_solr_1 + PS C:\> + ``` + Notice in the table above the container named "**\*_website_1**", with image named "website:dev". This is the website container which IP is needed. + 1. Make sure the container status is "Up" by checking the "STATUS" column. + 1. Copy the container id value. + 4. Run the following command to the the container's IP. + ```text + PS C:\> docker inspect --format="{{range .NetworkSettings.Networks}}{{.IPAddress}} {{end}}" ac58646e9013 + 172.22.99.92 + PS C:\> + ``` + +### Sitecore logs + +Sitecore logs can be found in the follwing location: + "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**storage\Data**“ + +### Sitecore site files + +The sitecore site files, in the Container, are directly accessible from the following folder in the development machine: + "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**storage\Website**“ + +Any change made in the above folder will be automatically detected by Sitecore in the container. + +## Release Configuration + +If the solution is switched to the "Release" configuration re-run, the container is re-created with the Website folder embedded inside along with the project output. This simplifies deployments to other environments (QA, UAT and Production). ## Known issues -1. Visual Studio fails when trying to attach just after starting debugging session. VS can attach to the running process in container afterwards, though. +1. Visual Studio fails when trying to attach just after starting debugging session. VS can attach to the running process in container afterwards, though. See section "Attaching VS2017 to Sitecore" for a workaround + From de2cb53d1a7280908305e282c08d6eaa3792f053 Mon Sep 17 00:00:00 2001 From: Benjamin Moles Date: Wed, 28 Mar 2018 17:07:17 +0200 Subject: [PATCH 7/8] Change repository URL in README.md file --- sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md index eb74f75..bcf8f88 100644 --- a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md +++ b/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md @@ -16,7 +16,7 @@ This demo showcases how to create a VS2017 project for Sitecore with the followi ## Development Environment Setup -1. Clone [this repository](https://github.com/Ben-m-s/docker-demo) into a folder such as “c:\Docker\Sitecore\docker-demo” (next steps will asume this folder has been used): +1. Clone [this repository](https://github.com/Sitecore/docker-demo) into a folder such as “c:\Docker\Sitecore\docker-demo” (next steps will asume this folder has been used): 1. Copy "**license.xml**" into "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**storage\Data**“ 1. Open VS2017 as Administrator 1. Open the solution “C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**Website.sln**” From 1dd102e0b3ede4f8c506d119a70000418f130807 Mon Sep 17 00:00:00 2001 From: Benjamin Moles Date: Wed, 28 Mar 2018 22:48:06 +0200 Subject: [PATCH 8/8] Rename solution's folder and *.sln file as agreed in Slack --- .../VS2017/{Website => SimpleSample}/.gitattributes | 0 .../VS2017/{Website => SimpleSample}/.gitignore | 0 .../VS2017/{Website => SimpleSample}/README.md | 12 ++++++------ .../Website.sln => SimpleSample/SimpleSample.sln} | 0 .../{Website => SimpleSample}/Website/.dockerignore | 0 .../{Website => SimpleSample}/Website/DebugBoot.ps1 | 0 .../{Website => SimpleSample}/Website/Dockerfile | 0 .../{Website => SimpleSample}/Website/Global.asax | 0 .../{Website => SimpleSample}/Website/Global.asax.cs | 0 .../Website/Properties/AssemblyInfo.cs | 0 .../Website/Views/web.config | 0 .../Website/Web.Debug.config | 0 .../Website/Web.Release.config | 0 .../{Website => SimpleSample}/Website/Web.config | 0 .../{Website => SimpleSample}/Website/Website.csproj | 0 .../Website/build.Dockerfile | 0 .../Website/packages.config | 0 .../{Website => SimpleSample}/docker-compose.dcproj | 0 .../docker-compose.override.yml | 0 .../docker-compose.vs.debug.yml | 0 .../docker-compose.vs.release.yml | 0 .../{Website => SimpleSample}/docker-compose.yml | 0 .../{Website => SimpleSample}/storage/Data/README.md | 0 .../storage/Databases/README.md | 0 .../{Website => SimpleSample}/storage/Solr/README.md | 0 .../storage/Website/README.md | 0 26 files changed, 6 insertions(+), 6 deletions(-) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/.gitattributes (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/.gitignore (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/README.md (95%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website/Website.sln => SimpleSample/SimpleSample.sln} (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/.dockerignore (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/DebugBoot.ps1 (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/Dockerfile (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/Global.asax (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/Global.asax.cs (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/Properties/AssemblyInfo.cs (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/Views/web.config (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/Web.Debug.config (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/Web.Release.config (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/Web.config (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/Website.csproj (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/build.Dockerfile (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/Website/packages.config (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/docker-compose.dcproj (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/docker-compose.override.yml (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/docker-compose.vs.debug.yml (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/docker-compose.vs.release.yml (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/docker-compose.yml (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/storage/Data/README.md (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/storage/Databases/README.md (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/storage/Solr/README.md (100%) rename sitecore/9.0.1 rev. 171219 XM1/VS2017/{Website => SimpleSample}/storage/Website/README.md (100%) diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/.gitattributes b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/.gitattributes similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/.gitattributes rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/.gitattributes diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/.gitignore b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/.gitignore similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/.gitignore rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/.gitignore diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/README.md similarity index 95% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/README.md index bcf8f88..8337e4d 100644 --- a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/README.md +++ b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/README.md @@ -17,9 +17,9 @@ This demo showcases how to create a VS2017 project for Sitecore with the followi ## Development Environment Setup 1. Clone [this repository](https://github.com/Sitecore/docker-demo) into a folder such as “c:\Docker\Sitecore\docker-demo” (next steps will asume this folder has been used): -1. Copy "**license.xml**" into "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**storage\Data**“ +1. Copy "**license.xml**" into "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\SimpleSample\\**storage\Data**“ 1. Open VS2017 as Administrator -1. Open the solution “C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**Website.sln**” +1. Open the solution “C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\SimpleSample\\**SimpleSample.sln**” 1. Make sure the project “**docker-compose**” is set as StartUp project 1. Build the solution. The two projects in the solution should compile. 1. Build the solution with “**Debug**” configuration ("F5"). @@ -27,14 +27,14 @@ This demo showcases how to create a VS2017 project for Sitecore with the followi 1. Copy the website's container’s IP from the VS' "Output" panel (make sure it is the "Docker" output) and paste the IP on a browser's address bar. Please notice that Sitecore needs some time to warm-up, therefore the initial start may take a bit (up to 1-2 min). 1. The browser will display the OOTB Sitecore’s home page. 1. Any change made to the following folder will be automatically detected by sitecore - "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**storage\Website**“ + "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\SimpleSample\\**storage\Website**“ ## Development Process Sitecore supports multiple sites and also multiple URL for each site. It may be necessary to access the site with a specific URL (other than the IP). In these cases, it is necessary to update the development environment's host file every time the container is run (instantiated), which happens the first time VS runs the project. Following the initial container run, the container can remain running meanwhile changes are done to the website and published to the following folder through the standard VS publishing feature (as if the container was an IIS instance running locally). - "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**storage\Website**“ + "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\SimpleSample\\**storage\Website**“ ## Debugging Sitecore with VS2017 @@ -81,12 +81,12 @@ The following steps describes how to attach VS2017 to the IIS process where Site ### Sitecore logs Sitecore logs can be found in the follwing location: - "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**storage\Data**“ + "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\SimpleSample\\**storage\Data**“ ### Sitecore site files The sitecore site files, in the Container, are directly accessible from the following folder in the development machine: - "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\Website\\**storage\Website**“ + "C:\Docker\Sitecore\docker-demo\sitecore\9.0.1 rev. 171219 XM1\VS2017\SimpleSample\\**storage\Website**“ Any change made in the above folder will be automatically detected by Sitecore in the container. diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website.sln b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/SimpleSample.sln similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website.sln rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/SimpleSample.sln diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/.dockerignore b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/.dockerignore similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/.dockerignore rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/.dockerignore diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/DebugBoot.ps1 b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/DebugBoot.ps1 similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/DebugBoot.ps1 rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/DebugBoot.ps1 diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Dockerfile b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Dockerfile similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Dockerfile rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Dockerfile diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Global.asax b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Global.asax similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Global.asax rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Global.asax diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Global.asax.cs b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Global.asax.cs similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Global.asax.cs rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Global.asax.cs diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Properties/AssemblyInfo.cs b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Properties/AssemblyInfo.cs similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Properties/AssemblyInfo.cs rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Properties/AssemblyInfo.cs diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Views/web.config b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Views/web.config similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Views/web.config rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Views/web.config diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Web.Debug.config b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Web.Debug.config similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Web.Debug.config rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Web.Debug.config diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Web.Release.config b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Web.Release.config similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Web.Release.config rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Web.Release.config diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Web.config b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Web.config similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Web.config rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Web.config diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Website.csproj b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Website.csproj similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/Website.csproj rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/Website.csproj diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/build.Dockerfile b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/build.Dockerfile similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/build.Dockerfile rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/build.Dockerfile diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/packages.config b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/packages.config similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/Website/packages.config rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/Website/packages.config diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.dcproj b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/docker-compose.dcproj similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.dcproj rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/docker-compose.dcproj diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.override.yml b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/docker-compose.override.yml similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.override.yml rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/docker-compose.override.yml diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.vs.debug.yml b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/docker-compose.vs.debug.yml similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.vs.debug.yml rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/docker-compose.vs.debug.yml diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.vs.release.yml b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/docker-compose.vs.release.yml similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.vs.release.yml rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/docker-compose.vs.release.yml diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.yml b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/docker-compose.yml similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/docker-compose.yml rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/docker-compose.yml diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Data/README.md b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/storage/Data/README.md similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Data/README.md rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/storage/Data/README.md diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Databases/README.md b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/storage/Databases/README.md similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Databases/README.md rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/storage/Databases/README.md diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Solr/README.md b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/storage/Solr/README.md similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Solr/README.md rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/storage/Solr/README.md diff --git a/sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Website/README.md b/sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/storage/Website/README.md similarity index 100% rename from sitecore/9.0.1 rev. 171219 XM1/VS2017/Website/storage/Website/README.md rename to sitecore/9.0.1 rev. 171219 XM1/VS2017/SimpleSample/storage/Website/README.md