diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fb58b47ca..cd9d1878f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.20 - 18 Oct 2017 + +* No longer take a hard dependency on the [Azure Account](https://marketplace.visualstudio.com/items?itemName=ms-vscode.azure-account) extension. + ## 0.0.19 - 14 Oct 2017 * Add an automatic refresh option for the explorer (`"docker.explorerRefreshInterval": 1000`) diff --git a/README.md b/README.md index 9cbfaab195..845db20ecc 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,9 @@ Many of the most common Docker and docker compose commands are built right into ![intelliSense](images/commands.gif) ## Explorer Integration -The Docker Explorer lets you view and manage your Images and Containers. The right click context menu provides quick access to the same rich set of commands found in the Command Palette (`F1`). +The Docker Explorer lets you view and manage your Images, Containers, and browse your DockerHub registry. If the [Azure Account](https://marketplace.visualstudio.com/items?itemName=ms-vscode.azure-account) extension is installed, you can browse your Azure Container Registries as well. + +The right click context menu provides quick access to the same rich set of commands found in the Command Palette (`F1`). ![explorer integration](images/explorer.png) @@ -41,13 +43,15 @@ If you want to turn the Explorer off for all workspaces, set the `showExplorer` ## Deploying images to Azure App Service -With the Docker Explorer you can now browse DockerHub and any Azure Container Registries you may have access to. The first time you expand the DockerHub node you'll be prompted to log into your DockerHub account. +With the Docker Explorer you can deploy images from DockerHub Registries or Azure Container Registries, directly to an Azure App Service instance. This functionality requires installing the [Azure Account](https://marketplace.visualstudio.com/items?itemName=ms-vscode.azure-account) extension and an Azure Subscription. If you do not have an Azure subscription, [sign up today](https://azure.microsoft.com/en-us/free/?b=16.48) for a free 30 day account and get $200 in Azure Credits to try out any combination of Azure services. + +The first time you expand the DockerHub node you'll be prompted to log into your DockerHub account. ![DockerHub Login](images/dockerHubLogin.gif) Your user name and password are stored in your operating system credentials vault (e.g. MacOS keychain, Windows Credential Store) so that you don't need to log in every time. You can log out of DockerHub by right clicking on the DockerHub label and choosing log out. This will delete the credentials from the OS store. -If you have an Azure Account you can sign in using the Device Login flow. Click on "Copy & Open" to open your default browser. +To log into Azure, press `F1` and search for `Azure Login`. You will then sign into your account using the Device Login flow. Click on "Copy & Open" to open your default browser. ![Azure Login](images/devicelogin.png) @@ -59,15 +63,13 @@ You can now right click on an image in DockerHub or an Azure Container Registry ![Deploy to Azure](images/deploytoazure.png) -From here you will be prompted for a Resource Group, an App Service Plan, and a website name which must be globally unique. +From here you will be prompted for a Resource Group, location, an App Service Plan, and a globally unique website name. ## Azure CLI Microsoft ships the latest [Azure CLI](https://github.com/azure/azure-cli) as a [Docker image](https://hub.docker.com/r/azuresdk/azure-cli-python/). You can easily launch a container running the CLI from the Command Palette (press F1 and search for `Docker: Azure CLI`). The extension will then run an interactive terminal attached to the container. After the container is started, you will be prompted to login to your Azure account. From there, set the subscription you want to work with using `az account set` (you can see all of your subscriptions with `az account list`). You do not need to login in every time you run the container becasue the extension volume mounts the local `$HOME/.azure` folder to the container's `$HOME/.azure` folder. -> If you do not have an Azure subscription, [sign up today](https://azure.microsoft.com/en-us/free/?b=16.48) for a free 30 day account and get **$200** in Azure Credits to try out any combination of Azure services. - ## Installation In VS Code, press F1 and type in `ext install vscode-docker`. Once the extension is installed you will be prompted to restart Visual Studio Code which will only take (literally) a couple of seconds. diff --git a/package.json b/package.json index cf6b360ac1..62ed0749c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vscode-docker", - "version": "0.0.19", + "version": "0.0.20", "publisher": "PeterJausovec", "displayName": "Docker", "description": "Adds syntax highlighting, commands, hover tips, and linting for Dockerfile and docker-compose files.",