diff --git a/README.md b/README.md
index d445cd0..86ca6f3 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,9 @@ A recipe is the script you run. It calls multiple helper scripts. These curren
## You may want to customize the scripts
These scripts should cover a lot of what you need but will not likely match your personal preferences exactly. In this case please fork the project and change the scripts however you desire. We really appreciate PR's back to this project if you have recommended changes.
-*Note: To use the Readme links for your fork you'll need to update the links to refer to your fork as follows:*
+*Note: The one-click links use the following format. When working out of a different Fork or Branch you'll want to update the links as follows:*
-`http://boxstarter.org/package/url?https://raw.githubusercontent.com/GITHUB_DOMAIN/windows-dev-box-setup-scripts/YOUR_BRANCH/RECIPE_NAME.ps
+`http://boxstarter.org/package/url?https://raw.githubusercontent.com/GITHUB_DOMAIN/windows-dev-box-setup-scripts/YOUR_BRANCH/RECIPE_NAME.ps1
`
For more info on testing your changes take a look at the [contribution guidelines](CONTRIBUTING.md).
@@ -42,9 +42,10 @@ To run a recipe script, click a link in the table below from your target machine
|Web NodeJS | Web Dev with NodeJS (Web + NodeJS LTS)ยน |
|Machine Learning Windows| Machine Learning with only Windows native tools |
|Machine Learning Linux| Machine Learning with Linux tools running on WSL |
+|DevOps Azure| Client setup for DevOps with Azure |
| | Xamarin (Visual Studio, Xamarin, Android SDK) |
| | Containers (Docker, Kubernetes, etc...) |
-| | More Coming Soon! |
+| | Submit a PR with a recommended configuration! |
**Notes:**
1. If you are using WSL there's a followup step we recommend after running the setup script. When the script finishes you will only have a root user with a blank password. You should manually create a non-root user via `$ sudo adduser [USERNAME] sudo`
diff --git a/demos/README.md b/demos/README.md
new file mode 100644
index 0000000..75b23bd
--- /dev/null
+++ b/demos/README.md
@@ -0,0 +1,20 @@
+# How to run the scripts
+Before you begin, please read the [Legal](#Legal) section.
+
+To run a recipe script, click a link in the table below from your target machine. This will download the Boxstarter one-click application, and prompt you for Boxstarter to run with Administrator privileges (which it needs to do its job). Clicking yes in this dialog will cause the recipe to begin. You can then leave the job unattended and come back when it's finished.
+
+## Customize the scripts
+These scripts should cover a lot of what you need but will not likely match your personal preferences exactly. In this case please fork the project and change the scripts however you desire. We really appreciate PR's back to this project if you have recommended changes.
+
+*Note: The one-click links use the following format. When working out of a different Fork or Branch you'll want to update the links as follows:*
+
+`http://boxstarter.org/package/url?https://raw.githubusercontent.com/GITHUB_DOMAIN/windows-dev-box-setup-scripts/YOUR_BRANCH/demos/RECIPE_NAME.ps1
+`
+
+|Click link to run |Description |
+|---------|---------|
+|ChocolateyFest 2018 | DevOps tools and some examples of personalization |
+| | Add to this list by submitting a PR with your example configuration! |
+
+# Contributing
+Do you want to contribute? We would love your help. Here are our contribution guidelines.
diff --git a/demos/chocolateyfest2018.ps1 b/demos/chocolateyfest2018.ps1
index 2b81e80..a39fa26 100644
--- a/demos/chocolateyfest2018.ps1
+++ b/demos/chocolateyfest2018.ps1
@@ -1,8 +1,9 @@
# Description: Boxstarter Script
# Author: Microsoft
-# Common settings for web dev
+# chocolatey fest demo
Disable-UAC
+$ConfirmPreference = "None" #ensure installing powershell modules don't prompt on needed dependencies
# Get the base URI path from the ScriptToCall value
$bstrappackage = "-bootstrapPackage"
@@ -11,7 +12,8 @@ $strpos = $helperUri.IndexOf($bstrappackage)
$helperUri = $helperUri.Substring($strpos + $bstrappackage.Length)
$helperUri = $helperUri.TrimStart("'", " ")
$helperUri = $helperUri.TrimEnd("'", " ")
-$helperUri = $helperUri.Substring(0, $helperUri.LastIndexOf("/"))
+$strpos = $helperUri.LastIndexOf("/demos/")
+$helperUri = $helperUri.Substring(0, $strpos)
$helperUri += "/scripts"
write-host "helper script base URI is $helperUri"
@@ -24,18 +26,43 @@ function executeScript {
#--- Setting up Windows ---
executeScript "FileExplorerSettings.ps1";
executeScript "SystemConfiguration.ps1";
-executeScript "CommonDevTools.ps1";
executeScript "RemoveDefaultApps.ps1";
+executeScript "CommonDevTools.ps1";
+executeScript "Browsers.ps1";
+
+executeScript "HyperV.ps1";
+RefreshEnv
executeScript "WSL.ps1";
-executeScript "VirtualizationTools.ps1";
+RefreshEnv
+executeScript "Docker.ps1";
-#--- Browsers ---
-choco install -y googlechrome
-choco install -y firefox
+choco install powershell-core
+choco install azure-cli
+Install-Module -Force Az
+choco install microsoftazurestorageexplorer
+choco install terraform
-# TODO: Expand on tools/configuration options here
-# Tools inside WSL
-# Azure CLI
+# Install tools in WSL instance
+write-host "Installing tools inside the WSL distro..."
+Ubuntu1804 run apt install ansible -y
+Ubuntu1804 run apt install nodejs -y
+
+# personalize
+choco install microsoft-teams
+choco install office365business
+
+# checkout recent projects
+mkdir C:\github
+cd C:\github
+git.exe clone https://github.com/microsoft/windows-dev-box-setup-scripts
+git.exe clone https://github.com/microsoft/winappdriver
+git.exe clone https://github.com/microsoft/wsl
+
+# set desktop wallpaper
+Invoke-WebRequest -Uri 'http://chocolateyfest.com/wp-content/uploads/2018/05/img-bg-front-page-header-NO_logo-opt.jpg' -Method Get -ContentType image/jpeg -OutFile 'C:\github\chocofest.jpg'
+Set-ItemProperty -path 'HKCU:\Control Panel\Desktop\' -name wallpaper -value 'C:\github\chocofest.jpg'
+rundll32.exe user32.dll, UpdatePerUserSystemParameters
+RefreshEnv
Enable-UAC
Enable-MicrosoftUpdate
diff --git a/devops_azure.ps1 b/devops_azure.ps1
index 285510d..d37c7af 100644
--- a/devops_azure.ps1
+++ b/devops_azure.ps1
@@ -3,6 +3,7 @@
# Common settings for azure devops
Disable-UAC
+$ConfirmPreference = "None" #ensure installing powershell modules don't prompt on needed dependencies
# Get the base URI path from the ScriptToCall value
$bstrappackage = "-bootstrapPackage"
@@ -25,13 +26,24 @@ function executeScript {
executeScript "FileExplorerSettings.ps1";
executeScript "SystemConfiguration.ps1";
executeScript "RemoveDefaultApps.ps1";
-executeScript "WSL.ps1";
-executeScript "HyperV.ps1";
-executeScript "Docker.ps1";
+executeScript "CommonDevTools.ps1";
executeScript "Browsers.ps1";
-# TODO: Expand on tools/configuration options here
-# Azure CLI, Azure PS, Azure SDK, Ansible, TerraForms
+executeScript "HyperV.ps1";
+RefreshEnv
+executeScript "WSL.ps1";
+RefreshEnv
+executeScript "Docker.ps1";
+
+choco install powershell-core
+choco install azure-cli
+Install-Module -Force Az
+choco install microsoftazurestorageexplorer
+choco install terraform
+
+# Install tools in WSL instance
+write-host "Installing tools inside the WSL distro..."
+Ubuntu1804 run apt install ansible -y
Enable-UAC
Enable-MicrosoftUpdate
diff --git a/scripts/Docker.ps1 b/scripts/Docker.ps1
index d4d0b35..c2e7bbd 100644
--- a/scripts/Docker.ps1
+++ b/scripts/Docker.ps1
@@ -1,2 +1,4 @@
+Enable-WindowsOptionalFeature -Online -FeatureName containers -All
+RefreshEnv
choco install -y docker-for-windows
choco install -y vscode-docker
diff --git a/scripts/RemoveDefaultApps.ps1 b/scripts/RemoveDefaultApps.ps1
index 7b2a48d..c24a073 100644
--- a/scripts/RemoveDefaultApps.ps1
+++ b/scripts/RemoveDefaultApps.ps1
@@ -45,7 +45,8 @@ $applicationList = @(
"Microsoft.Print3D"
"*Autodesk*"
"*BubbleWitch*"
- "king.com.CandyCrush*"
+ "king.com*"
+ "G5*"
"*Dell*"
"*Facebook*"
"*Keeper*"
diff --git a/scripts/WSL.ps1 b/scripts/WSL.ps1
index 80de0a8..53edb15 100644
--- a/scripts/WSL.ps1
+++ b/scripts/WSL.ps1
@@ -5,6 +5,8 @@ choco install -y Microsoft-Windows-Subsystem-Linux -source windowsfeatures
Invoke-WebRequest -Uri https://aka.ms/wsl-ubuntu-1804 -OutFile ~/Ubuntu.appx -UseBasicParsing
Add-AppxPackage -Path ~/Ubuntu.appx
# run the distro once and have it install locally with root user, unset password
+
+RefreshEnv
Ubuntu1804 install --root
Ubuntu1804 run apt update
Ubuntu1804 run apt upgrade -y