Merge branch 'master' into swarm2017

This commit is contained in:
Jerome Petazzoni
2017-12-22 22:50:02 +01:00
2 changed files with 3 additions and 5 deletions

View File

@@ -215,10 +215,10 @@ tmux
2. If you want to control a remote tmux:
rm -f /tmp/tmux-{uid}/default
ssh -t -L /tmp/tmux-{uid}/default:/tmp/tmux-1001/default docker@{ipaddr} tmux
rm -f /tmp/tmux-{uid}/default && ssh -t -L /tmp/tmux-{uid}/default:/tmp/tmux-1001/default docker@{ipaddr} tmux
3. If you cannot control a remote tmux:
tmux new-session ssh docker@{ipaddr}
""".format(uid=uid, ipaddr=ipaddr))
else:

View File

@@ -35,9 +35,7 @@ class: self-paced
<br/>you will be given specific instructions to access your cluster
- If you are doing this on your own:
<br/>the first chapter will give you various options like
[Play-With-Docker](http://www.play-with-docker.com/)
to get your own cluster
<br/>the first chapter will give you various options to get your own cluster
---