doc fixes

Author: sanagama

4-run-dev-image.sh

@@ -14,3 +14,4 @@ docker run --name 'sqldocker-dev' --cap-add SYS_PTRACE \
  -d mcr.microsoft.com/mssql/server:2017-latest
 
 docker ps
+

5-create-script-dev-db.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 #
-# Use mssql-scripter to generate SQL script to extract schema + data of the 'Customer' table
+# Use mssql-scripter to generate SQL script to extract schema + data only for the "Customer" table
 # Note that we're using the 'scripter' user for whom the data is masked
 #
 
 set -x
 DBNAME="AdventureworksLT"
 
-# Generate script with schema + data from pre-production image 'sqldocker'
+# Connect to source Docker container (sqldocker) and generate script with schema + data for "Customer" table
 mssql-scripter -S 127.0.0.1 -U scripter -P Yukon900 -d $DBNAME \
  --schema-and-data \
  --script-create \
@@ -16,7 +16,7 @@ mssql-scripter -S 127.0.0.1 -U scripter -P Yukon900 -d $DBNAME \
 
 cat ./create-customer.sql | more
 
-# Create database and schema
+# Connect to target Docker container (sqldocker-dev) and create database and schema
 sqlcmd -S 127.0.0.1,1432 -U sa -P Yukon900 -Q "CREATE DATABASE $DBNAME"
 sqlcmd -S 127.0.0.1,1432 -U sa -P Yukon900 -d $DBNAME -Q "CREATE SCHEMA [SalesLT]"
 

README.md

@@ -5,7 +5,6 @@
 This repo has the ***demo scripts*** and ***talking points*** for the ***SQL Server in Docker*** demos presented to the STRAPS team in Salesforce Marketing Cloud, May 2019.
 
 Jump to:
-- [Demo Setup](https://github.com/sanagama/sqldemo-docker/blob/master/demo-setup.md)
 - [Demo Script](https://github.com/sanagama/sqldemo-docker/blob/master/demo-script.md)
 
 ## Prerequisites
@@ -16,3 +15,32 @@ These are the prerequisites to run this demo:
 - A MacBook (or other computer)
 - Azure Data Studio
 - Docker
+
+## Demo Setup
+
+Perform these steps ***once*** on your computer:
+
+### Setup MacBook
+
+1. Install *Python* and *pip* on your MacBook. Here's a great guide for macOS: <https://hackercodex.com/guide/python-development-environment-on-mac-osx>
+1. Download and install Azure Data Studio for MacOS from here: <https://docs.microsoft.com/en-us/sql/azure-data-studio/download>
+1. Install the *mssql-scripter* commands line tool as described here: <https://github.com/Microsoft/sql-xplat-cli/blob/dev/doc/installation_guide.md>
+1. Install *mssql-tools* for macOS as described here: <https://docs.microsoft.com/en-us/sql/linux/sql-server-linux-setup-tools#macos>
+1. Install the *mssql-cli* command line tool as described here: <https://docs.microsoft.com/en-us/sql/tools/mssql-cli>
+1. Browse to <https://github.com/sanagama/sqldemo-docker>
+1. Click ```Clone or Download``` then click ```Download ZIP```
+1. Save the ZIP file to your ```HOME``` directory
+1. Extract the zip file to ```~/sqldemo-docker```
+
+### Setup Docker
+
+Download Docker for your operating system and complete the installation:
+- [Docker for Mac](https://www.docker.com/docker-mac)
+- [Docker for Windows](https://www.docker.com/docker-windows)
+
+Increase Docker memory to 4 GB as documented here:
+<https://docs.microsoft.com/en-us/sql/linux/quickstart-install-connect-docker#requirements>
+
+
+## Congrats! You have completed the one-time demo setup!
+

backups/restore-adventureworks.sql

@@ -19,3 +19,4 @@ GO
 -- Dump database names
 SELECT NAME FROM SYS.DATABASES
 GO
+

backups/restore-wwi.sh

@@ -5,3 +5,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # run sqlcmd inside the Docker container to restore WideWorldImporters
 /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Yukon900 -i /backups/restore-wwi.sql
+
+

backups/restore-wwi.sql

@@ -20,3 +20,4 @@ GO
 -- Dump database names
 SELECT NAME FROM SYS.DATABASES
 GO
+

demo-script.md

@@ -5,8 +5,7 @@
 This page has the ***demo scripts*** and ***talking points*** for the ***SQL Server in Docker*** demos presented to the STRAPS team in Salesforce Marketing Cloud, May 2019.
 
 Jump to:
-- [Main README.md](https://github.com/sanagama/sqldemo-docker)
-- [Demo Setup](https://github.com/sanagama/sqldemo-docker/blob/master/demo-setup.md)
+- [README.md](https://github.com/sanagama/sqldemo-docker)
 
 
 ## Demo Script
@@ -19,7 +18,7 @@ Jump to:
 1. [Create dev environment](#4-create-dev-environment)
 1. [Share container](#5-share-container)
 
-#### SQL in Docker Intro
+### SQL in Docker Intro
 
 (**Talking Points**)
 - Let me talk a bit about running SQL in Docker.
@@ -39,7 +38,7 @@ Running SQL Server in Docker gives you 3 major benefits:
 
 Let's start
 
-#### 1. Run SQL in Docker
+### 1. Run SQL in Docker
 
 Launch a ```Terminal``` window and type the following:
 ```
@@ -67,7 +66,7 @@ cat ./2-run-sqlcmd.sh
 (**Talking Points**)
 - That was a basic demo of SQL Server in Docker
 
-#### 2. Restore a database backup
+### 2. Restore a database backup
 
 (**Talking Points**)
 - Let's try restoring a backup of the ```Wide World Importers``` database to SQL running in Docker
@@ -82,7 +81,7 @@ cat ./3-restore-db.sh
 ./3-restore-db.sh
 ```
 
-#### 3. Create pre-production environment
+### 3. Create pre-production environment
 
 (**Talking Points**)
 - Let's do something more interesting
@@ -109,7 +108,7 @@ Talk to each statement as you execute it.
 - Next problem: this is the full database but you only needs the ```Customer``` table.
 - Let's see how we can address that
 
-#### 4. Create dev environment
+### 4. Create dev environment
 
 (**Talking Points**)
 - My ```sqldocker``` Docker image is still running
@@ -162,7 +161,7 @@ Switch back to Azure Data Studio.
 - Our dev environment is ready!
 - Now, how can we share these environments with the rest of the team?
 
-#### 5. Share container
+### 5. Share container
 
 (**Talking Points**)
 - We can easily push these images to Docker hub for others to use