Merge pull request microsoft#63 from knom/master

perrysk-msft · web-flow · commit 618e150da36f · 2016-06-22T10:30:42.000-07:00
Attach external databases - parts missing at first merge
diff --git a/samples/manage/windows-containers/mssql-server-2014-express-windows/readme.md b/samples/manage/windows-containers/mssql-server-2014-express-windows/readme.md
@@ -1,92 +1,111 @@
-# mssql-server-2014-express-windows
-This Dockerfile helps developers to get started using SQL Server 2014 Express in Windows Server Core Containers. The file downloads and installs SQL Server 2014 Express with the default setup parameters.
-
-Note: This dockerfile is based on Buc Rogers' work that can be found [here] (https://github.com/brogersyh/Dockerfiles-for-windows/tree/master/sqlexpress)
-
-### Contents
-
-[About this sample](#about-this-sample)<br/>
-[Before you begin](#before-you-begin)<br/>
-[Run this sample](#run-this-sample)<br/>
-[Sample details](#sample-details)<br/>
-[Disclaimers](#disclaimers)<br/>
-[Related links](#related-links)<br/>
-
-<a name=about-this-sample></a>
-
-## About this sample
-
-1. **Applies to:** SQL Server 2014 Express, Windows Server Technical Preview 4 or later
-5. **Authors:** Perry Skountrianos [perrysk-msft], Max Knor [knom]
-
-<a name=before-you-begin></a>
-
-## Before you begin
-
-To run this sample, you need the following prerequisites.
-
-**Software prerequisites:**
-
-You can run the container with the following command. 
-(Note the you'll need Windows Server Core TP5 v10.0.14300.1000.)
-
-```` 
-docker run -p 1433:1433 -v C:/temp/:C:/temp/ --env sa_password=<YOUR SA PASSWORD> --env attach_dbs="<DB-JSON-CONFIG>" -v microsoft/mssql-server-2014-express-windows
-```` 
-
-- **-p HostPort:containerPort** is for port-mapping a container network port to a host port.
-- **-v HostPath:containerPath** is for mounting a folder from the host inside the container. 
-
-  This can be used for saving database outside of the container.
-
-<a name=run-this-sample></a>
-
-## Run this sample
-
-The image provides two environment variables to optionally set: </br>
-- sa_password: Sets the sa password and enables the sa login
-- attach_dbs: The configuration for attaching custom DBs (.mdf, .ldf files).
-
-  This should be a JSON string, formed like the following (note the SINGLE quotes and everything in one line):
-  ``` 
-[{'dbName':'MaxDb','dbFiles':['C:\\temp\\maxtest.mdf','C:\\temp\\maxtest_log.
-ldf']},{'dbName':'PerryDb','dbFiles':['C:\\temp\\perrytest.mdf','C:\\temp\\perrytest_log.
-ldf']}]
-  ``` 
-  There can be zero to many databases in the array.
-  - dbName: The name of the database
-  - dbFiles: An array of absolute paths to the .MDF and .LDF files.
-
-    Can be one or many, note that the path has double backslashes for escaping!
-
-This example shows all parameters in action:	
-```
-docker run -p 1433:1433 -v C:/temp/:C:/temp/ --env attach_dbs="[{'dbName':'MaxTest','dbFiles':['C:\\temp\\maxtest.mdf','C:\\temp\\maxtest_log.
-ldf']}]" microsoft/mssql-server-2014-express-windows
-```
-	
-<a name=sample-details></a>
-
-## Sample details
-
-The Dockerfile downloads and installs SQL Server 2014 Express with the following default setup parameters that could be changed (if needed) after the image is installed.
-- Collation: SQL_Latin1_General_CP1_CI_AS
-- SQL Instance Name: SQLEXPRESS
-- Root Directory: C:\Program Files\Microsoft SQL Server\MSSQL12.SQLEXPRESS\MSSQL
-- Language: English (United Stated)
-
-<a name=disclaimers></a>
-
-## Disclaimers
-The code included in this sample is not intended to be a set of best practices on how to build scalable enterprise grade applications. This is beyond the scope of this quick start sample.
-
-<a name=related-links></a>
-
-## Related Links
-<!-- Links to more articles. Remember to delete "en-us" from the link path. -->
-
-For more information, see these articles:
-- [Windows Containers] (https://msdn.microsoft.com/en-us/virtualization/windowscontainers/about/about_overview)
-- [Windows-based containers: Modern app development with enterprise-grade control] (https://www.youtube.com/watch?v=Ryx3o0rD5lY&feature=youtu.be)
-- [Windows Containers: What, Why and How] (https://channel9.msdn.com/Events/Build/2015/2-704)
-- [SQL Server in Windows Containers] (https://blogs.msdn.microsoft.com/sqlserverstorageengine/2016/03/21/sql-server-in-windows-containers/#comments)
+# mssql-server-2014-express-windows
+This Dockerfile helps developers to get started using SQL Server 2014 Express in Windows Server Core Containers. The file downloads and installs SQL Server 2014 Express with the default setup parameters.
+
+Note: This dockerfile is based on Buc Rogers' work that can be found [here] (https://github.com/brogersyh/Dockerfiles-for-windows/tree/master/sqlexpress)
+
+### Contents
+
+[About this sample](#about-this-sample)<br/>
+[Before you begin](#before-you-begin)<br/>
+[Run this sample](#run-this-sample)<br/>
+[Sample details](#sample-details)<br/>
+[Disclaimers](#disclaimers)<br/>
+[Related links](#related-links)<br/>
+
+<a name=about-this-sample></a>
+
+## About this sample
+
+1. **Applies to:** SQL Server 2014 Express, Windows Server Technical Preview 4 or later
+5. **Authors:** Perry Skountrianos [perrysk-msft], Max Knor [knom]
+
+<a name=before-you-begin></a>
+
+## Before you begin
+
+To run this sample, you need the following prerequisites.
+
+**Software prerequisites:**
+
+You can run the container with the following command. 
+(Note the you'll need Windows Server Core TP5 v10.0.14300.1000.)
+
+```` 
+docker run -p 1433:1433 -v C:/temp/:C:/temp/ --env sa_password=<YOUR SA PASSWORD> --env attach_dbs="<DB-JSON-CONFIG>" microsoft/mssql-server-2014-express-windows
+```` 
+
+- **-p HostPort:containerPort** is for port-mapping a container network port to a host port.
+- **-v HostPath:containerPath** is for mounting a folder from the host inside the container. 
+
+  This can be used for saving database outside of the container.
+
+- **-it** can be used to show the verbose output of the SQL startup script.
+
+  Use this to debug the container in case of issues.
+
+<a name=run-this-sample></a>
+
+## Run this sample
+
+The image provides two environment variables to optionally set: </br>
+- **sa_password**: Sets the sa password and enables the sa login
+- **attach_dbs**: The configuration for attaching custom DBs (.mdf, .ldf files).
+
+  This should be a JSON string, in the following format (note the use of SINGLE quotes!)
+  ``` 
+  [
+	{
+		'dbName': 'MaxDb',
+		'dbFiles': ['C:\\temp\\maxtest.mdf',
+		'C:\\temp\\maxtest_log.ldf']
+	},
+	{
+		'dbName': 'PerryDb',
+		'dbFiles': ['C:\\temp\\perrytest.mdf',
+		'C:\\temp\\perrytest_log.ldf']
+	}
+  ]
+  ``` 
+
+  This is an array of databases, which can have zero to N databases.
+  
+  Each consisting of:
+  - **dbName**: The name of the database
+  - **dbFiles**: An array of one or many absolute paths to the .MDF and .LDF files.
+	
+	**Note:**
+	The path has double backslashes for escaping!
+	The path refers to files **within the container**. So make sure to include them in the image or mount them via **-v**!
+		
+
+This example shows all parameters in action:	
+```
+docker run -p 1433:1433 -v C:/temp/:C:/temp/ --env attach_dbs="[{'dbName':'MaxTest','dbFiles':['C:\\temp\\maxtest.mdf','C:\\temp\\maxtest_log.
+ldf']}]" microsoft/mssql-server-2014-express-windows
+```
+	
+<a name=sample-details></a>
+
+## Sample details
+
+The Dockerfile downloads and installs SQL Server 2014 Express with the following default setup parameters that could be changed (if needed) after the image is installed.
+- Collation: SQL_Latin1_General_CP1_CI_AS
+- SQL Instance Name: SQLEXPRESS
+- Root Directory: C:\Program Files\Microsoft SQL Server\MSSQL12.SQLEXPRESS\MSSQL
+- Language: English (United Stated)
+
+<a name=disclaimers></a>
+
+## Disclaimers
+The code included in this sample is not intended to be a set of best practices on how to build scalable enterprise grade applications. This is beyond the scope of this quick start sample.
+
+<a name=related-links></a>
+
+## Related Links
+<!-- Links to more articles. Remember to delete "en-us" from the link path. -->
+
+For more information, see these articles:
+- [Windows Containers] (https://msdn.microsoft.com/en-us/virtualization/windowscontainers/about/about_overview)
+- [Windows-based containers: Modern app development with enterprise-grade control] (https://www.youtube.com/watch?v=Ryx3o0rD5lY&feature=youtu.be)
+- [Windows Containers: What, Why and How] (https://channel9.msdn.com/Events/Build/2015/2-704)
+- [SQL Server in Windows Containers] (https://blogs.msdn.microsoft.com/sqlserverstorageengine/2016/03/21/sql-server-in-windows-containers/#comments)
diff --git a/samples/manage/windows-containers/mssql-server-2014-express-windows/start.ps1 b/samples/manage/windows-containers/mssql-server-2014-express-windows/start.ps1
@@ -20,22 +20,26 @@ if($sa_password -ne "_"){
     Invoke-Sqlcmd -Query $sqlcmd -ServerInstance ".\SQLEXPRESS" 
 }
 
-$attach_dbs = $attach_dbs | ConvertFrom-Json
+$attach_dbs_cleaned = $attach_dbs.TrimStart('\\').TrimEnd('\\')
 
-if ($null -ne $attach_dbs){
-	Write-Verbose "Attaching database(s)"
-	Foreach($db in $attach_dbs)
+Write-Verbose "Attach Database configuration passed: $($attach_dbs_cleaned)"
+
+$dbs = $attach_dbs_cleaned | ConvertFrom-Json
+
+if ($null -ne $dbs -And $dbs.Length -gt 0){
+	Write-Verbose "Attaching $($dbs.Length) database(s)"
+	Foreach($db in $dbs)
 	{
 		$files = @();
 		Foreach($file in $db.dbFiles)
 		{
-			$files += "(FILENAME = 'N$($file)')";
+			$files += "(FILENAME = N'$($file)')";
 		}
 		
 		$files = $files -join ","
-		$sqlcmd = "sp_detach_db $($db.dbName);GO;CREATE DATABASE $($db.dbName) ON $($files) FOR ATTACH ;GO;"
+		$sqlcmd = "sp_detach_db $($db.dbName);CREATE DATABASE $($db.dbName) ON $($files) FOR ATTACH ;"
 
-		Write-Host Invoke-Sqlcmd -Query $($sqlcmd) -ServerInstance ".\SQLEXPRESS" 
+		Write-Verbose "Invoke-Sqlcmd -Query $($sqlcmd) -ServerInstance '.\SQLEXPRESS'"
 		Invoke-Sqlcmd -Query $sqlcmd -ServerInstance ".\SQLEXPRESS"
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -20,22 +20,26 @@ if($sa_password -ne "_"){`
`20`	`20`	`Invoke-Sqlcmd -Query $sqlcmd -ServerInstance ".\SQLEXPRESS"`
`21`	`21`	`}`
`22`	`22`
`23`		`-$attach_dbs = $attach_dbs \| ConvertFrom-Json`
	`23`	`+$attach_dbs_cleaned = $attach_dbs.TrimStart('\\').TrimEnd('\\')`
`24`	`24`
`25`		`-if ($null -ne $attach_dbs){`
`26`		`- Write-Verbose "Attaching database(s)"`
`27`		`- Foreach($db in $attach_dbs)`
	`25`	`+Write-Verbose "Attach Database configuration passed: $($attach_dbs_cleaned)"`
	`26`	`+`
	`27`	`+$dbs = $attach_dbs_cleaned \| ConvertFrom-Json`
	`28`	`+`
	`29`	`+if ($null -ne $dbs -And $dbs.Length -gt 0){`
	`30`	`+ Write-Verbose "Attaching $($dbs.Length) database(s)"`
	`31`	`+ Foreach($db in $dbs)`
`28`	`32`	`{`
`29`	`33`	`$files = @();`
`30`	`34`	`Foreach($file in $db.dbFiles)`
`31`	`35`	`{`
`32`		`- $files += "(FILENAME = 'N$($file)')";`
	`36`	`+ $files += "(FILENAME = N'$($file)')";`
`33`	`37`	`}`
`34`	`38`
`35`	`39`	`$files = $files -join ","`
`36`		`- $sqlcmd = "sp_detach_db $($db.dbName);GO;CREATE DATABASE $($db.dbName) ON $($files) FOR ATTACH ;GO;"`
	`40`	`+ $sqlcmd = "sp_detach_db $($db.dbName);CREATE DATABASE $($db.dbName) ON $($files) FOR ATTACH ;"`
`37`	`41`
`38`		`- Write-Host Invoke-Sqlcmd -Query $($sqlcmd) -ServerInstance ".\SQLEXPRESS"`
	`42`	`+ Write-Verbose "Invoke-Sqlcmd -Query $($sqlcmd) -ServerInstance '.\SQLEXPRESS'"`
`39`	`43`	`Invoke-Sqlcmd -Query $sqlcmd -ServerInstance ".\SQLEXPRESS"`
`40`	`44`	`}`
`41`	`45`	`}`