-
Notifications
You must be signed in to change notification settings - Fork 7.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
WIP: add Cloud link to Azure topics (#2713)
* add Cloud link to Azure topics WIP: 1st draft includes, tabs re: SSH key topics adding more Azure Cloud content and SSH includes copyedits cloud azure, aws topics organization, videos incorporated review comments copyedits, colour-coded TBD's copyedits to make create a swarm w/AWS and Azure consistent updated links to use new titles added SSH key setup to the Swarm overview list of links updated link services titles add ssh to glossary, note autoredeploy limitations Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * screen snaps, updates per latest on staging Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * added link Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * resolved conflicts in TOC Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * added Azure accept EULA/enable subscription, more steps, snaps Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * fixed the comments to not break numbering Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * new snaps and review comments incorporated from Alberto and Ryan Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * added screen snaps, review comments, more steps Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * added screen snaps, detail to Azure create swarm Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * new snap showing linked AWS as provider Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * AWS screen snaps and detailed steps Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * AWS swarm name rules clarification Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * added x-refs to edition topics on config per reviews Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * added connect screen snap w/production commands, AWS pricing Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * added more code examples and clarification to swarm connect Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * added more code examples for Azure and AWS Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
- Loading branch information
1 parent
fe47871
commit e552c02
Showing
54 changed files
with
887 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
You can now create _new_ Docker Swarms from within Docker Cloud as well as | ||
register existing swarms. | ||
|
||
When you create a swarm, Docker Cloud connects to the Cloud provider on your | ||
behalf, and uses the provider's APIs and a provider-specific template to launch | ||
Docker instances. The instances are then joined to a swarm and the swarm is | ||
configured using your input. When you access the swarm from Docker Cloud, the | ||
system forwards your commands directly to the Docker instances running in the | ||
swarm. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
|
||
<ul class="nav nav-tabs"> | ||
<li class="active"><a data-toggle="tab" data-target="#mac-add-keys" data-group="mac">Mac</a></li> | ||
<li><a data-toggle="tab" data-target="#win-add-keys" data-group="win">Windows</a></li> | ||
<li><a data-toggle="tab" data-target="#linux-add-keys" data-group="linux">Linux</a></li> | ||
</ul> | ||
<div class="tab-content"> | ||
<div id="mac-add-keys" class="tab-pane fade in active"> | ||
<br> | ||
{% capture mac-content-add %} | ||
1. Start the `ssh-agent` in the background using the command `eval "$(ssh-agent -s)"`. You will get the agent process ID in return. | ||
|
||
```none | ||
eval "$(ssh-agent -s)" | ||
Agent pid 59566 | ||
``` | ||
2. On macOS Sierra 10.12.2 or newer, modify your | ||
`~/.ssh/config` file to automatically load keys into the `ssh-agent` and store | ||
passphrases in your keychain. | ||
```none | ||
Host * | ||
AddKeysToAgent yes | ||
UseKeychain yes | ||
IdentityFile ~/.ssh/id_rsa | ||
``` | ||
3. Add your SSH private key to the ssh-agent, using the default macOS `ssh-add` command. | ||
```none | ||
$ ssh-add -K ~/.ssh/id_rsa | ||
``` | ||
If you created your key with a different name or have an existing key | ||
with a different name, replace `id_rsa` in the command with the | ||
name of your private key file. | ||
{% endcapture %} | ||
{{ mac-content-add | markdownify }} | ||
</div> | ||
<div id="win-add-keys" class="tab-pane fade"> | ||
<br> | ||
{% capture win-content-add %} | ||
1. Start the `ssh-agent` in the background. | ||
```none | ||
eval "$(ssh-agent -s)" | ||
Agent pid 59566 | ||
``` | ||
2. Add your SSH private key to the ssh-agent. | ||
```none | ||
$ ssh-add -K ~/.ssh/id_rsa | ||
``` | ||
If you created your key with a different name or have an existing key | ||
with a different name, replace `id_rsa` in the command with the | ||
name of your private key file. | ||
{% endcapture %} | ||
{{ win-content-add | markdownify }} | ||
</div> | ||
<div id="linux-add-keys" class="tab-pane fade"> | ||
<br> | ||
{% capture linux-content-add %} | ||
1. Start the `ssh-agent` in the background. | ||
```none | ||
eval "$(ssh-agent -s)" | ||
Agent pid 59566 | ||
``` | ||
2. Add your SSH private key to the ssh-agent. | ||
```none | ||
$ ssh-add -K ~/.ssh/id_rsa | ||
``` | ||
If you created your key with a different name or have an existing key | ||
with a different name, replace `id_rsa` in the command with the | ||
name of your private key file. | ||
{% endcapture %} | ||
{{ linux-content-add | markdownify }} | ||
</div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
|
||
<ul class="nav nav-tabs"> | ||
<li class="active"><a data-toggle="tab" data-target="#mac-copy-keys" data-group="mac">Mac</a></li> | ||
<li><a data-toggle="tab" data-target="#win-copy-keys" data-group="win">Windows</a></li> | ||
<li><a data-toggle="tab" data-target="#linux-copy-keys" data-group="linux">Linux</a></li> | ||
</ul> | ||
<div class="tab-content"> | ||
<div id="mac-copy-keys" class="tab-pane fade in active"> | ||
<br> | ||
{% capture mac-content-copy %} | ||
|
||
Copy the public SSH key to your clipboard. | ||
|
||
```none | ||
$ pbcopy < ~/.ssh/id_rsa.pub | ||
``` | ||
|
||
If your SSH key file has a different name than the example code, modify the | ||
filename to match your current setup. | ||
|
||
>**Tip:** If you don't have `pbcopy`, you navigate to the hidden `.ssh` | ||
folder, open the file in a text editor, and copy it to your clipboard. | ||
For example: `$ atom ~/.ssh/id_rsa.pub` | ||
|
||
{% endcapture %} | ||
{{ mac-content-copy | markdownify }} | ||
</div> | ||
|
||
<div id="win-copy-keys" class="tab-pane fade"> | ||
<br> | ||
{% capture win-content-copy %} | ||
|
||
Copy the public SSH key to your clipboard. | ||
|
||
```none | ||
$ clip < ~/.ssh/id_rsa.pub | ||
``` | ||
|
||
If your SSH key file has a different name than the example code, modify the | ||
filename to match your current setup. | ||
|
||
>**Tip:** If `clip` doesn't work, navigate the hidden `.ssh` | ||
folder, open the file in a text editor, and copy it to your clipboard. | ||
For example: `$ notepad ~/.ssh/id_rsa.pub` | ||
|
||
{% endcapture %} | ||
{{ win-content-copy | markdownify }} | ||
</div> | ||
|
||
<div id="linux-copy-keys" class="tab-pane fade"> | ||
<br> | ||
{% capture linux-content-copy %} | ||
|
||
If you don't already have it, install `xclip`. (The example uses `apt-get` to install, but you might want to use another package installer like `yum`.) | ||
|
||
```none | ||
$ sudo apt-get install xclip | ||
``` | ||
|
||
Copy the SSH key to your clipboard. | ||
|
||
```none | ||
$ xclip -sel clip < ~/.ssh/id_rsa.pub | ||
``` | ||
|
||
>**Tip:** If you `xclip` isn't working, navigate to hidden `.ssh` folder, | ||
open the file in a text editor, and copy it to your clipboard. | ||
For example: `$ vi ~/.ssh/id_rsa.pub` | ||
|
||
{% endcapture %} | ||
{{ linux-content-copy | markdownify }} | ||
</div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,118 @@ | ||
|
||
<ul class="nav nav-tabs"> | ||
<li class="active"><a data-toggle="tab" data-target="#mac-find-keys" data-group="mac">Mac</a></li> | ||
<li><a data-toggle="tab" data-target="#win-find-keys" data-group="win">Windows</a></li> | ||
<li><a data-toggle="tab" data-target="#linux-find-keys" data-group="linux">Linux</a></li> | ||
</ul> | ||
<div class="tab-content"> | ||
<div id="mac-find-keys" class="tab-pane fade in active"> | ||
<br> | ||
{% capture mac-content-find %} | ||
|
||
1. Open a command-line terminal. | ||
|
||
```none | ||
$ ls -al ~/.ssh | ||
``` | ||
This lists files in your `.ssh` directory. | ||
2. Check to see if you already have a SSH keys you can use. | ||
Default file names for public keys are: | ||
* id_dsa.pub | ||
* id_ecdsa.pub | ||
* id_ed25519.pub | ||
* id_rsa.pub | ||
Here are example results showing a public and private key pair with the default names: | ||
```none | ||
drwx------ 8 me staff 272 Mar 27 14:04 . | ||
drwxr-xr-x+ 69 me staff 2346 Apr 7 10:03 .. | ||
-rw-r--r-- 1 me staff 420 Mar 27 14:04 config | ||
-rw------- 1 me staff 3326 Mar 27 14:01 id_rsa | ||
-rw-r--r-- 1 me staff 752 Mar 27 14:01 id_rsa.pub | ||
``` | ||
The file `id_rsa` contains the private key which resides on the local machine, and `id_rsa.pub` is the public key we can provide to a remote account. | ||
{% endcapture %} | ||
{{ mac-content-find | markdownify }} | ||
</div> | ||
<div id="win-find-keys" class="tab-pane fade"> | ||
<br> | ||
{% capture win-content-find %} | ||
1. Open Git Bash. | ||
```none | ||
$ ls -al ~/.ssh | ||
``` | ||
This will list files in your `.ssh` directory. | ||
2. Check to see if you already have SSH keys you can use. | ||
Default file names for public keys are: | ||
* id_dsa.pub | ||
* id_ecdsa.pub | ||
* id_ed25519.pub | ||
* id_rsa.pub | ||
Here are example results showing a public and private key pair with the default names: | ||
```none | ||
drwx------ 8 me staff 272 Mar 27 14:04 . | ||
drwxr-xr-x+ 69 me staff 2346 Apr 7 10:03 .. | ||
-rw-r--r-- 1 me staff 420 Mar 27 14:04 config | ||
-rw------- 1 me staff 3326 Mar 27 14:01 id_rsa | ||
-rw-r--r-- 1 me staff 752 Mar 27 14:01 id_rsa.pub | ||
``` | ||
The file `id_rsa` contains the private key which resides on the local machine, and `id_rsa.pub` is the public key we can provide to a remote account. | ||
{% endcapture %} | ||
{{ win-content-find | markdownify }} | ||
</div> | ||
<div id="linux-find-keys" class="tab-pane fade"> | ||
<br> | ||
{% capture linux-content-find %} | ||
1. Open a command-line terminal. | ||
```none | ||
$ ls -al ~/.ssh | ||
``` | ||
This will list files in your `.ssh` directory. | ||
2. Check to see if you already have a SSH keys you can use. | ||
Default file names for public keys are: | ||
* id_dsa.pub | ||
* id_ecdsa.pub | ||
* id_ed25519.pub | ||
* id_rsa.pub | ||
Here are example results showing a public and private key pair with the default names: | ||
```none | ||
drwx------ 8 me staff 272 Mar 27 14:04 . | ||
drwxr-xr-x+ 69 me staff 2346 Apr 7 10:03 .. | ||
-rw-r--r-- 1 me staff 420 Mar 27 14:04 config | ||
-rw------- 1 me staff 3326 Mar 27 14:01 id_rsa | ||
-rw-r--r-- 1 me staff 752 Mar 27 14:01 id_rsa.pub | ||
``` | ||
The file `id_rsa` contains the private key which resides on the local machine, and `id_rsa.pub` is the public key we can provide to a remote account. | ||
{% endcapture %} | ||
{{ linux-content-find | markdownify }} | ||
</div> | ||
</div> |
Oops, something went wrong.