diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 6619f84..2c97c81 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/10.-Setting-the-solution-up-in-ACS-Kubernetes.md b/10.-Setting-the-solution-up-in-ACS-Kubernetes.md index 8c9436c..9a92e42 100644 --- a/10.-Setting-the-solution-up-in-ACS-Kubernetes.md +++ b/10.-Setting-the-solution-up-in-ACS-Kubernetes.md @@ -187,10 +187,10 @@ Type the following in your command prompt: After logging in with a supported account identity, you can use either Azure Resource Manager mode or Azure Service Management mode CLI commands. -3. **Select your Azure subscription** You might have several Azure subscriptions as shown if you type the following. +3. **Select your Azure subscription** You might have [several Azure subscriptions](https://docs.microsoft.com/en-us/cli/azure/account#set) as shown if you type the following. >``` >az account list - >`` + >``` If you have multiple subscription accounts, you first need to select the Azure subscription account you want to target. Type the following: >``` >account set "Your Azure Subscription Name or ID" @@ -231,7 +231,7 @@ We have simplified the deployment so you can do it just by executing a script by 1. Open a PowerShell command line at the `k8s` directory of your local eShopOnContainers repository. 2. Ensure `docker`, `docker-compose`, and `kubectl` are on the path, and configured for your Docker machine and Kubernetes cluster. -3. Run `deploy.ps1` with your registry information. The Docker username and password are provided by Azure Container Registry, and can be retrieved from the Azure portal. Optionally, ACR credentials can be obtained by running the following command: +3. Run the `deploy.ps1` script. But you'll need to know your Azure Container Registry credentials first. The Docker username and password are provided by Azure Container Registry, and can be retrieved from the Azure portal. Optionally, ACR credentials can be obtained by running the following command: >``` >az acr credential show -n eShopAutogenContainerRegistry @@ -240,13 +240,16 @@ We have simplified the deployment so you can do it just by executing a script by Once the user and password are retrieved, run the following script for deployment, including your values and password. For example: >``` ->./deploy.ps1 -registry eshopautogencontainerregistry.azurecr.io -dockerUser eShopAutogenContainerRegistry -dockerPassword SecretPassword +>./deploy.ps1 -registry eshopautogencontainerregistry.azurecr.io -dockerUser eShopAutogenContainerRegistry -dockerPassword YourSuperSecretPassword >``` The script will build the .NET Core code, SPA TypeScript code and corresponding Docker images, push the latter to your registry at Azure Container Registry, and deploy the application to your cluster. -You can watch the deployment unfold from the Kubernetes web interface: run `kubectl proxy` and open a browser to [http://localhost:8001/ui](http://localhost:8001/ui) as in the following screenshot: +While deploying eShopOnContainers with the script, you can see the Docker image repositories being created in your **Azure Container Registry** which happens right before deploying to Kubernetes, at the Azure's portal: + + +You can also watch the deployment unfold from the Kubernetes web interface by running `kubectl proxy` in a different PowerShell or bash window and open a browser to [http://localhost:8001/ui](http://localhost:8001/ui) as in the following screenshot: diff --git a/img/kubernetes/azure-container-service-repos.png b/img/kubernetes/azure-container-service-repos.png new file mode 100644 index 0000000..217dfcb Binary files /dev/null and b/img/kubernetes/azure-container-service-repos.png differ