Skip to content

Commit

Permalink
WIP: add Cloud link to Azure topics (#2713)
Browse files Browse the repository at this point in the history
* 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
londoncalling authored May 2, 2017
1 parent fe47871 commit e552c02
Show file tree
Hide file tree
Showing 54 changed files with 887 additions and 105 deletions.
10 changes: 6 additions & 4 deletions _data/glossary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ ENTRYPOINT: |
of the command to be run. If you want your Dockerfile to be runnable without
specifying additional arguments to the `docker run` command, you must specify
either `ENTRYPOINT`, `CMD`, or both.
- If `ENTRYPOINT` is specified, it is set to a single command. Most official
Docker images have an `ENTRYPOINT` of `/bin/sh` or `/bin/bash`. Even if you
do not specify `ENTRYPOINT`, you may inherit it from the base image that you
Expand Down Expand Up @@ -184,7 +184,7 @@ namespace: |
resource, including `net` (networking), `mnt` (storage), `pid` (processes), `uts` (hostname control),
and `user` (UID mapping). For more information about namespaces, see [Docker run reference](/engine/reference/run.md)
and [Introduction to user namespaces](https://success.docker.com/KBase/Introduction_to_User_Namespaces_in_Docker_Engine){ :target="_blank" class="_" }.
node: |
A [node](/engine/swarm/how-swarm-mode-works/nodes/) is a physical or virtual
machine running an instance of the Docker Engine in swarm mode.
Expand Down Expand Up @@ -213,6 +213,9 @@ repository: |
Here is an example of the shared [nginx repository](https://hub.docker.com/_/nginx/)
and its [tags](https://hub.docker.com/r/library/nginx/tags/).
SSH: |
SSH (secure shell) is a secure protocol for accessing remote machines and applications. It
provides authentication and encrypts data communication over insecure networks such as the Internet. SSH uses public/private key pairs to authenticate logins.
service: |
A [service](/engine/swarm/how-swarm-mode-works/services/) is the definition of how
you want to run your application containers in a swarm. At the most basic level
Expand Down Expand Up @@ -313,11 +316,10 @@ volume: |
There are three types of volumes: *host, anonymous, and named*:
- A **host volume** lives on the Docker host's filesystem and can be accessed from within the container.
- A **host volume** lives on the Docker host's filesystem and can be accessed from within the container.
- A **named volume** is a volume which Docker manages where on disk the volume is created,
but it is given a name.
- An **anonymous volume** is similar to a named volume, however, it can be difficult, to refer to
the same volume over time when it is an anonymous volumes. Docker handle where the files are stored.
14 changes: 10 additions & 4 deletions _data/toc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1269,13 +1269,19 @@ manuals:
title: Using Swarm mode
- path: /docker-cloud/cloud-swarm/register-swarms/
title: Register existing swarms
- path: /docker-cloud/cloud-swarm/create-cloud-swarm/
title: Create a new swarm in Docker Cloud
- path: /docker-cloud/cloud-swarm/create-cloud-swarm-aws/
title: Create a new swarm on Amazon Web Services in Docker Cloud
- path: /docker-cloud/cloud-swarm/create-cloud-swarm-azure/
title: Create a new swarm on Microsoft Azure in Docker Cloud
- path: /docker-cloud/cloud-swarm/connect-to-swarm/
title: Connect to a swarm through Docker Cloud
- path: /docker-cloud/cloud-swarm/link-aws-swarm/
title: Link to Amazon Web Services to create swarms
- sectiontitle: Manage infrastructure (standard mode)
title: Link Amazon Web Services to Docker Cloud
- path: /docker-cloud/cloud-swarm/link-azure-swarm/
title: Link Microsoft Azure Cloud Services to Docker Cloud
- path: /docker-cloud/cloud-swarm/ssh-key-setup/
title: Set up SSH keys
- sectiontitle: Manage Infrastructure (standard mode)
section:
- path: /docker-cloud/infrastructure/
title: Infrastructure overview
Expand Down
9 changes: 9 additions & 0 deletions _includes/content/cloud-swarm-overview.md
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.
92 changes: 92 additions & 0 deletions _includes/content/ssh/ssh-add-keys-to-agent.md
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>
73 changes: 73 additions & 0 deletions _includes/content/ssh/ssh-copy-key.md
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>
118 changes: 118 additions & 0 deletions _includes/content/ssh/ssh-find-keys.md
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>
Loading

0 comments on commit e552c02

Please sign in to comment.