Updated environment variables and sqlpackage docs

rothja · rothja · commit 421351554779 · 2017-07-13T07:55:31.000-04:00
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path": "docs/linux/sql-server-linux-migrate-sqlpackage.md",
+            "redirect_url": "/sql/linux/sql-server-linux-migrate-ssms",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/linux/sql-server-linux-get-started-tutorial.md",
             "redirect_url": "/sql/linux/sql-server-linux-overview",
diff --git a/docs/linux/TOC.md b/docs/linux/TOC.md
@@ -39,8 +39,7 @@
 
 ## [Migrate](sql-server-linux-migrate-overview.md)
 ### [Restore from Windows](sql-server-linux-migrate-restore-database.md)
-### [Export and import a BACPAC with SqlPackage](sql-server-linux-migrate-sqlpackage.md)
-### [Export and import a BACPAC with SSMS](sql-server-linux-migrate-ssms.md)
+### [Export and import a BACPAC from Windows](sql-server-linux-migrate-ssms.md)
 ### [Migrate with SQL Server Migration Assistant](sql-server-linux-migrate-ssma.md)
 ### [Bulk copy with bcp](sql-server-linux-migrate-bcp.md)
 ### [Load data with (SSIS)](sql-server-linux-migrate-ssis.md)
diff --git a/docs/linux/quickstart-install-connect-docker.md b/docs/linux/quickstart-install-connect-docker.md
@@ -61,13 +61,13 @@ The following steps increase the memory for Docker for Windows to 4 GB.
 1. To run the container image with Docker, you can use the following command from a bash shell (Linux/macOS):
 
     ```bash
-    docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=<YourStrong!Passw0rd>' -p 1401:1433 -d microsoft/mssql-server-linux
+    docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=<YourStrong!Passw0rd>' -e 'MSSQL_PID=Developer' -p 1401:1433 -d microsoft/mssql-server-linux
     ```
 
     If you are using Docker for Windows, use the following command from an elevated PowerShell command-prompt:
 
     ```PowerShell
-    docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=<YourStrong!Passw0rd>" -p 1401:1433 -d microsoft/mssql-server-linux
+    docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=<YourStrong!Passw0rd>" -e "MSSQL_PID=Developer" -p 1401:1433 -d microsoft/mssql-server-linux
     ```
 
     > [!NOTE]
@@ -79,6 +79,7 @@ The following steps increase the memory for Docker for Windows to 4 GB.
     |-----|-----|
     | **-e 'ACCEPT_EULA=Y'** |  Set the **ACCEPT_EULA** variable to any value to confirm your acceptance of the [End-User Licensing Agreement](http://go.microsoft.com/fwlink/?LinkId=746388). Required setting for the SQL Server image. |
     | **-e 'SA_PASSWORD=\<YourStrong!Passw0rd\>'** | Specify your own strong password that is at least 8 characters and meets [SQL Server's password requirements](../relational-databases/security/password-policy.md). Required setting for the SQL Server image. |
+    | **-e 'MSSQL_PID=Developer'** | Specifies the edition or product key. In this example, the freely licensed Developer Edition is used for non-production testing. For other values, see [Configure SQL Server settings with environment variables on Linux](sql-server-linux-configure-environment-variables.md). |
     | **-p 1401:1433** | Map a TCP port on the host environment (first value) with a TCP port in the container (second value). In this example, SQL Server is listening on TCP 1433 in the container and this is exposed to the port, 1401, on the host. |
     | **microsoft/mssql-server-linux** | The SQL Server Linux container image. Unless otherwise specified, this defaults to the **latest** image. |
 
@@ -100,7 +101,7 @@ The SA account is a system administrator on the SQL Server instance that gets cr
 
 1. Choose a strong password to use for the SA user.
 
-1. Use `docker exec` to run **sqlcmd** to change the password using Transact-SQL.
+1. Use `docker exec` to run **sqlcmd** to change the password using Transact-SQL. Replace `<Old Password>` and `<New Password>` with your password values.
 
 > ```bash
 > docker exec -it <Container ID> /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P '<Old Password>' -Q 'ALTER LOGIN SA WITH PASSWORD="<New Password>";'
diff --git a/docs/linux/sql-server-linux-configure-environment-variables.md b/docs/linux/sql-server-linux-configure-environment-variables.md
@@ -6,7 +6,7 @@ description: This topic describes how to use environment variables to configure
 author: rothja
 ms.author: jroth
 manager: jhubbard
-ms.date: 05/22/2017
+ms.date: 07/17/2017
 ms.topic: article
 ms.prod: sql-linux
 ms.technology: database-engine
@@ -25,31 +25,64 @@ ms.assetid:
 ---
 # Configure SQL Server settings with environment variables on Linux
 
-You can use several different environment variables to configure SQL Server 2017 RC1 on Linux. This topic provides a list of the settings that are configurable using environment variables.
+You can use several different environment variables to configure SQL Server 2017 RC1 on Linux. These variables are used in two scenarios:
 
-> [!IMPORTANT]
-> At this time, the environment variables only configure [SQL Server running in Docker](sql-server-linux-setup-docker.md). To configure the SQL Server service outside of a Docker scenario, see [Configure SQL Server on Linux with the mssql-conf tool](sql-server-linux-configure-mssql-conf.md).
+- Initial unprompted setup with `mssql-conf -n setup` command.
+- Configuring a new [SQL Server container in Docker](quickstart-install-connect-docker.md).
+
+> [!TIP]
+> If you need to configure SQL Server after these setup scenarios, see [Configure SQL Server on Linux with the mssql-conf tool](sql-server-linux-configure-mssql-conf.md).
 
 ## Environment variables
 
 | Environment variable | Description |
 |-----|-----|
-| **ACCEPT_EULA** | Accept the SQL Server license agreement when set to any value (for example, 'Y'). Used on first install only. |
-| **SA_PASSWORD** | Configure the SA user password. Used on first install only. |
+| **ACCEPT_EULA** | Accept the SQL Server license agreement when set to any value (for example, 'Y'). |
+| **SA_PASSWORD** | Configure the SA user password. |
+| **MSSQL_PID** | Set the SQL Server edition or product key. Possible values include: Evaluation, Developer, Express, Web, Standard, Enterprise, or a product key in the form of #####-#####-#####-#####-#####, where '#' is a number or a letter. |
+| **MSSQL_LCID** | Sets the language ID to use for SQL Server. For example 1036 is French. |
+| **MSSQL_COLLATION** | Sets the default collation for SQL Server. This overrides the default mapping of language id (LCID) to collation. |
+| **MSSQL_MEMORY_LIMIT_MB** | Sets the maximum amount of memory SQL Server can use. By default it is 80% of the total physical memory. |
 | **MSSQL_TCP_PORT** | Configure the TCP port that SQL Server listens on (default 1433). |
 | **MSSQL_IP_ADDRESS** | Set the IP address. Currently, the IP address must be IPv4 style (0.0.0.0). |
-| **MSSQL_BACKUP_DIR** | Sets the Default backup directory location. |
+| **MSSQL_BACKUP_DIR** | Set the Default backup directory location. |
 | **MSSQL_DATA_DIR** | Change the directory where the new SQL Server database data files (.mdf) are created. |
-| **MSSQL_LOG_DIR** | Changes the directory where the new SQL Server database log (.ldf) files are created. |
+| **MSSQL_LOG_DIR** | Change the directory where the new SQL Server database log (.ldf) files are created. |
 | **MSSQL_DUMP_DIR** | Change the directory where SQL Server will deposit the memory dumps and other troubleshooting files by default. |
 | **MSSQL_ENABLE_HADR** | Enable Availability Groups. |
 
-## Example
+## Example: initial setup
+
+The following example runs **mssql-conf setup** without prompts (`-n`). This mode looks for environment variables to use for configuration. The following environment variables are specified:
+
+- **ACCEPT_EULA** accepts the end user license agreement.
+- **MSSSQL_PID** specifies the freely licensed Developer Edition of SQL Server for non-production use.
+- **SA_PASSWORD** sets a strong password.
+- **MSSQL_TCP_PORT** sets the TCP port that SQL Server listens on to 1234.
+
+```bash
+sudo ACCEPT_EULA='Y' MSSQL_PID='Developer' SA_PASSWORD='<YourStrong!Passw0rd>' MSSQL_TCP_PORT=1234 /opt/mssql/bin/mssql-conf -n setup
+```
+
+## Example: Docker
+
+The following example docker command uses the following environment variables to create a new SQL Server 2017 container:
+
+- **ACCEPT_EULA** accepts the end user license agreement.
+- **MSSSQL_PID** specifies the freely licensed Developer Edition of SQL Server for non-production use.
+- **SA_PASSWORD** sets a strong password.
+- **MSSQL_TCP_PORT** sets the TCP port that SQL Server listens on to 1234. This means that instead of mapping port 1433 (default) to a host port, the custom TCP port must be mapped with the `-p 1234:1234` command in this example.
+
+If you are running Docker on Linux/macOS, use the following syntax with single quotes:
+
+```bash
+docker run -e ACCEPT_EULA=Y -e MSSQL_PID='Developer' -e SA_PASSWORD='<YourStrong!Passw0rd>' -e MSSQL_TCP_PORT=1234 -p 1234:1234 -d microsoft/mssql-server-linux
+```
 
-The following docker run command uses **MSSQL_TCP_PORT** to set the TCP port that SQL Server listens on. In this case, the host port mapping must that this new port into consideration. Instead of mapping port 1433 (default) to a host port, the custom TCP port must be mapped (1234 in this example).
+If you are running Docker on Windows, use the following syntax with double quotes:
 
 ```bash
-docker run -e ACCEPT_EULA=Y -e SA_PASSWORD='<YourStrong!Passw0rd>' -e MSSQL_TCP_PORT=1234 -p 1234:1234 -d microsoft/mssql-server-linux
+docker run -e ACCEPT_EULA=Y -e MSSQL_PID="Developer" -e SA_PASSWORD="<YourStrong!Passw0rd>" -e MSSQL_TCP_PORT=1234 -p 1234:1234 -d microsoft/mssql-server-linux
 ```
 
 ## Next steps
diff --git a/docs/linux/sql-server-linux-develop-overview.md b/docs/linux/sql-server-linux-develop-overview.md
@@ -72,7 +72,6 @@ You can also use new command-line tools that are native for Linux. These tools i
 
 - [sqlcmd](../tools/sqlcmd-utility.md)
 - [bcp](sql-server-linux-migrate-bcp.md)
-- [sqlpackage](sql-server-linux-migrate-sqlpackage.md)
 - [mssql-conf](sql-server-linux-configure-mssql-conf.md)
 
 ## Next steps
diff --git a/docs/linux/sql-server-linux-migrate-overview.md b/docs/linux/sql-server-linux-migrate-overview.md
@@ -41,8 +41,7 @@ For a tutorial on migrating a database with backup and restore, see the followin
 
 It is also possible to export your database to a BACPAC file (a compressed file that contains your database schema and data). If you have a BACPAC file, you can transfer this file to your Linux machine and then import it to SQL Server. For more information, see the following topics:
 
-- [Export and import a database with sqlpackage](sql-server-linux-migrate-sqlpackage.md)
-- [Export and import a database with SSMS](sql-server-linux-migrate-ssms.md)
+- [Export and import a database with SSMS or SqlPackage.exe](sql-server-linux-migrate-ssms.md)
 
 ## Migrate from other database servers
 You can migrate databases on other database systems to SQL Server 2017 on Linux. This includes Microsoft Access, DB2, MySQL, Oracle, and Sybase databases. In this scenario, use the SQL Server Management Assistant (SSMA) to automate the migration to SQL Server on Linux. For more information, see [Use SSMA to migrate databases to SQL Server on Linux](sql-server-linux-migrate-ssma.md).  
diff --git a/docs/linux/sql-server-linux-migrate-sqlpackage.md b/docs/linux/sql-server-linux-migrate-sqlpackage.md
diff --git a/docs/linux/sql-server-linux-migrate-ssms.md b/docs/linux/sql-server-linux-migrate-ssms.md
@@ -1,12 +1,12 @@
 ---
 # required metadata
 
-title: Export and import a database on Linux with SSMS | Microsoft Docs
+title: Export and import a database on Linux | Microsoft Docs
 description: 
 author: sanagama 
 ms.author: sanagama 
 manager: jhubbard
-ms.date: 03/17/2017
+ms.date: 07/17/2017
 ms.topic: article
 ms.prod: sql-linux
 ms.technology: database-engine
@@ -23,9 +23,9 @@ ms.assetid: 2210cfc3-c23a-4025-a551-625890d6845f
 ms.custom: H1Hack27Feb2017
 
 ---
-# Export and import a database on Linux with SQL Server Management Studio on Windows
+# Export and import a database on Linux with SSMS or SqlPackage.exe on Windows
 
-This topic shows how to use [SQL Server Management Studio (SSMS)](https://msdn.microsoft.com/library/mt238290.aspx) to export and import a database on SQL Server 2017 RC1 on Linux. SSMS is a Windows application, so use SSMS when you have a Windows machine that can connect to a remote SQL Server instance on Linux. 
+This topic shows how to use [SQL Server Management Studio (SSMS)](https://msdn.microsoft.com/library/mt238290.aspx) and [SqlPackage.exe](https://msdn.microsoft.com/library/hh550080.aspx) to export and import a database on SQL Server 2017 RC1 on Linux. SSMS and SqlPackage.exe are Windows applications, so use this technique when you have a Windows machine that can connect to a remote SQL Server instance on Linux.
 
 You should always install and use the most recent version of SQL Server Management Studio (SSMS) as described in [Use SSMS on Windows to connect to SQL Server on Linux](sql-server-linux-develop-use-ssms.md)
 
@@ -68,5 +68,22 @@ The *.BACPAC file is successfully created at the location you chose and you are
 
 The *.BACPAC file is imported to create a new database in the target server you specified.
 
+## <a id="sqlpackage"></a> SqlPackage command-line option
+
+It is also possible to use the SQL Server Data Tools (SSDT) command-line tool, [SqlPackage.exe](https://msdn.microsoft.com/library/hh550080.aspx) to export and import BACPAC files.
+
+The following example command exports a BACPAC file:
+
+```bash
+SqlPackage.exe /a:Export /ssn:tcp:<your_server> /sdn:<your_database> /su:<username> /sp:<password> /tf:<path_to_bacpac>
+```
+
+Use the following command to import database schema and user data from a .BACPAC file:
+
+```bash
+SqlPackage.exe /a:Import /tsn:tcp:<your_server> /tdn:<your_database> /tu:<username> /tp:<password> /sf:<path_to_bacpac>
+
+```
+
 ## See also
 For more information on how to use SSMS, see [Use SQL Server Management Studio](https://msdn.microsoft.com/library/ms174173.aspx).
diff --git a/docs/linux/sql-server-linux-release-notes.md b/docs/linux/sql-server-linux-release-notes.md
@@ -144,13 +144,6 @@ The following sections describe known issues with this release of SQL Server 201
 #### Full-Text Search
 - Not all filters are available with this release, including filters for Office documents. For a list of supported filters, see [Install SQL Server Full-Text Search on Linux](sql-server-linux-setup-full-text-search.md#filters).
 
-#### SqlPackage
-- Using SqlPackage requires specifying an absolute path for files. Using relative paths will map the files under the "/tmp/sqlpackage.\<code\>/system/system32" folder. 
-
-  - **Resolution**: Use absolute file paths.
-
-- SqlPackage shows the location of files with a "C:\\" prefix.
-
 #### SQL Server Integration Services (SSIS)
 You can run SSIS packages on Linux. For more info, see the [blog post announcing SSIS support for Linux](https://blogs.msdn.microsoft.com/ssis/2017/05/17/ssis-helsinki-is-available-in-sql-server-vnext-ctp2-1/). Please note the following known issues with this release.
 
diff --git a/docs/linux/sql-server-linux-whats-new.md b/docs/linux/sql-server-linux-whats-new.md
@@ -26,6 +26,8 @@ The RC1 release contains the following improvements and fixes:
 - Enabled [Windows Authentication](sql-server-linux-active-directory-authentication.md).
 - Enabled [DB Mail](../relational-databases/database-mail/database-mail.md).
 - Added IPV6 support.
+- Added environment variables for initial SQL Server setup. For more information, see [Configure SQL Server settings with environment variables on Linux](sql-server-linux-configure-environment-variables.md).
+- Removed **sqlpackage** from installed binaries. SqlPackage can still be run against Linux remotely from Windows.
 
 ## CTP 2.1
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"redirections": [`
	`3`	`+ {`
	`4`	`+ "source_path": "docs/linux/sql-server-linux-migrate-sqlpackage.md",`
	`5`	`+ "redirect_url": "/sql/linux/sql-server-linux-migrate-ssms",`
	`6`	`+ "redirect_document_id": false`
	`7`	`+ },`
`3`	`8`	`{`
`4`	`9`	`"source_path": "docs/linux/sql-server-linux-get-started-tutorial.md",`
`5`	`10`	`"redirect_url": "/sql/linux/sql-server-linux-overview",`