Merge pull request #2027 from justincormack/mobyup

Use the user's ssh key automatically in ssh examples
This commit is contained in:
Justin Cormack 2017-06-15 13:33:35 -07:00 committed by GitHub
commit 32f505469b
8 changed files with 22 additions and 8 deletions

View File

@ -20,7 +20,7 @@ endif
PREFIX?=/usr/local/
MOBY_COMMIT=e0aac90f4476c7dadfec9ab4116cf1363e51ce77
MOBY_COMMIT=d8cc1b3f08df02ad563d3f548ac2527931a925a6
bin/moby: Makefile | bin
docker run --rm --log-driver=none $(CROSS) $(GO_COMPILE) --clone-path github.com/moby/tool --clone https://github.com/moby/tool.git --commit $(MOBY_COMMIT) --package github.com/moby/tool/cmd/moby --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o $@ > tmp_moby_bin.tar
tar xf tmp_moby_bin.tar > $@

View File

@ -18,7 +18,9 @@ services:
image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55"
files:
- path: root/.ssh/authorized_keys
contents: '#public ssh key here'
source: ~/.ssh/id_rsa.pub
mode: "0600"
optional: true
trust:
org:
- linuxkit

View File

@ -18,7 +18,9 @@ services:
image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55"
files:
- path: root/.ssh/authorized_keys
contents: '#your ssh key here'
source: ~/.ssh/id_rsa.pub
mode: "0600"
optional: true
trust:
org:
- linuxkit

View File

@ -22,7 +22,9 @@ services:
image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55"
files:
- path: root/.ssh/authorized_keys
contents: '#your ssh key here'
source: ~/.ssh/id_rsa.pub
mode: "0600"
optional: true
trust:
org:
- linuxkit

View File

@ -37,7 +37,9 @@ services:
files:
- path: root/.ssh/authorized_keys
contents: '#your ssh key here'
source: ~/.ssh/id_rsa.pub
mode: "0600"
optional: true
trust:
org:

View File

@ -80,6 +80,8 @@ services:
rootfsPropagation: shared
files:
- path: root/.ssh/authorized_keys
contents: '# Your ssh key goes here'
source: ~/.ssh/id_rsa.pub
mode: "0600"
optional: true
- {path: etc/cni, directory: true}
- {path: opt/cni, directory: true}

View File

@ -76,6 +76,8 @@ services:
rootfsPropagation: shared
files:
- path: root/.ssh/authorized_keys
contents: '# Your ssh key goes here'
source: ~/.ssh/id_rsa.pub
mode: "0600"
optional: true
- {path: etc/cni, directory: true}
- {path: opt/cni, directory: true}

View File

@ -18,4 +18,6 @@ services:
image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55"
files:
- path: root/.ssh/authorized_keys
contents: '#your ssh key here'
source: ~/.ssh/id_rsa.pub
mode: "0600"
optional: true