github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-11-04 11:03:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1633 from rneugeba/demo

Browse Source 
Fixes to the demo
This commit is contained in:
Rolf Neugebauer
2017-04-14 12:14:25 -05:00
committed by GitHub
parent 5a49505915 24ff9b75d8
commit 60ccc23512
6 changed files with 43 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/gcp.yml
View File

@@ -32,7 +32,6 @@ onboot:
- /dev:/dev - /dev:/dev
- /var:/var - /var:/var
- /tmp/etc/resolv.conf:/etc/resolv.conf - /tmp/etc/resolv.conf:/etc/resolv.conf
readonly: true
net: host net: host
capabilities: capabilities:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN

46
projects/demo/README.md
View File

@@ -5,40 +5,13 @@ This directory contains files used in moby demos.
Most of the scripts/files assume you are on a Mac. Most of the scripts/files assume you are on a Mac.
- Recent Docker for Mac installed (edge, nightly, master channel) - Recent Docker for Mac installed (edge, nightly, master channel)
- Currently, you need a *custom* version of VPNKit installed in Docker For some of the demo setup, you need at least 17.05.0-ce-rc1
for Mac (see below)
- For the GCP portion: `brew install google-cloud-sdk` - For the GCP portion: `brew install google-cloud-sdk`
- For `etcd`: `brew install etcd`
- Infrakit: Clone [infrakit](https://github.com/docker/infrakit) and - Infrakit: Clone [infrakit](https://github.com/docker/infrakit) and
the [GCP plugin](https://github.com/docker/infrakit.gcp) for the [GCP plugin](https://github.com/docker/infrakit.gcp) for
infrakit. For each, `make build-in-container` and then copy the infrakit. The GCP plugin, needs to be v0.1. For each, `make
contents of `./build` somewhere in your path. build-in-container` and then copy the contents of `./build`
somewhere in your path.
For some of the demos, you currently need an updated version of VPNKit
for Docker for Mac. Hopefully this version will ship as default soon.
Quit docker for Mac
```
curl -fsSL --retry 10 -z vpnkit.tgz -o vpnkit.tgz https://circle-artifacts.com/gh/docker/vpnkit/708/artifacts/0/Users/distiller/vpnkit/vpnkit.tgz
tar xzvf vpnkit.tgz
cp Contents/MacOS/vpnkit /Applications/Docker.app/Contents/Resources/bin/
```
Restart Docker for Mac.
# Local setup
We use a `socat` container to forward ports from the VM to localhost (via Docker for Mac), to make it easier to access some VMs. To build
```
(cd dockerfiles; docker build -t socat -f Dockerfile.socat .)
```
And then run:
```
docker run --rm -t -d -p 8080:8080 socat tcp-listen:8080,reuseaddr,fork tcp:192.168.65.100:80
```
This forwards local port `8080` to `192.168.65.100:80`, so if you start, say the `intro` image, run `moby run -ip 196.168.65.100 intro`
# GCP Setup # GCP Setup
@@ -63,3 +36,14 @@ gcloud compute firewall-rules create rneugeba-demo-internal --network \
The firewall setup means that all our projects networks can talk to the demo network. The firewall setup means that all our projects networks can talk to the demo network.
# Expose VMs ports on localhost
You can use a `socat` container to forward ports from the VM to localhost (via Docker for Mac), to make it easier to access some VMs. To build
```
(cd dockerfiles; docker build -t socat -f Dockerfile.socat .)
```
And then run:
```
docker run --rm -t -d -p 8080:8080 socat tcp-listen:8080,reuseaddr,fork tcp:192.168.65.100:80
```
This forwards local port `8080` to `192.168.65.100:80`, so if you start, say the `intro` image, run `moby run -ip 196.168.65.100 intro`

2
projects/demo/etcd/build-pkg.sh
View File

@@ -1,4 +1,4 @@
#! /bin/sh #! /bin/sh
docker build -t mobylinux/etcd . docker build -t linuxkit/etcd .
docker build -t etcd.local -f Dockerfile.local . docker build -t etcd.local -f Dockerfile.local .

25
projects/demo/etcd/etcd.yml
View File

@@ -1,14 +1,14 @@
kernel: kernel:
image: "mobylinux/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot: onboot:
- name: sysctl - name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
net: host net: host
pid: host pid: host
ipc: host ipc: host
@@ -16,14 +16,14 @@ onboot:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
readonly: true readonly: true
- name: format - name: format
image: "mobylinux/format:53748000acf515549d398e6ae68545c26c0f3a2e" image: "linuxkit/format:53748000acf515549d398e6ae68545c26c0f3a2e"
binds: binds:
- /dev:/dev - /dev:/dev
capabilities: capabilities:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
- CAP_MKNOD - CAP_MKNOD
- name: mount - name: mount
image: "mobylinux/mount:d2669e7c8ddda99fa0618a414d44261eba6e299a" image: "linuxkit/mount:d2669e7c8ddda99fa0618a414d44261eba6e299a"
binds: binds:
- /dev:/dev - /dev:/dev
- /var:/var:rshared,rbind - /var:/var:rshared,rbind
@@ -32,7 +32,7 @@ onboot:
rootfsPropagation: shared rootfsPropagation: shared
command: ["/mount.sh", "/var/lib/etcd"] command: ["/mount.sh", "/var/lib/etcd"]
- name: dhcpcd - name: dhcpcd
image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" image: "linuxkit/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
binds: binds:
- /var:/var - /var:/var
- /tmp/etc:/etc - /tmp/etc:/etc
@@ -48,19 +48,18 @@ onboot:
- /dev:/dev - /dev:/dev
- /var:/var - /var:/var
- /tmp/etc/resolv.conf:/etc/resolv.conf - /tmp/etc/resolv.conf:/etc/resolv.conf
readonly: true
net: host net: host
capabilities: capabilities:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
services: services:
- name: rngd - name: rngd
image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9" image: "linuxkit/rngd:f5e5be43e730ea819c3293d5c6dcbfa7f4c5c314"
capabilities: capabilities:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
oomScoreAdj: -800 oomScoreAdj: -800
readonly: true readonly: true
- name: ntpd - name: ntpd
image: "mobylinux/openntpd:a570316d7fc49ca1daa29bd945499f4963d227af" image: "linuxkit/openntpd:a570316d7fc49ca1daa29bd945499f4963d227af"
capabilities: capabilities:
- CAP_SYS_TIME - CAP_SYS_TIME
- CAP_SYS_NICE - CAP_SYS_NICE
@@ -69,7 +68,7 @@ services:
- CAP_SETGID - CAP_SETGID
net: host net: host
- name: etcd - name: etcd
image: "mobylinux/etcd" image: "linuxkit/etcd"
capabilities: capabilities:
- CAP_CHOWN - CAP_CHOWN
- CAP_SETUID - CAP_SETUID

12
projects/demo/intro/intro.yml
View File

@@ -1,13 +1,13 @@
kernel: kernel:
image: "mobylinux/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- mobylinux/init:925c88f42d92d57cd36b656db1f8757b152163a7 - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
onboot: onboot:
- name: sysctl - name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
net: host net: host
pid: host pid: host
ipc: host ipc: host
@@ -16,7 +16,7 @@ onboot:
readonly: true readonly: true
services: services:
- name: dhcpcd - name: dhcpcd
image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" image: "linuxkit/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
binds: binds:
- /var:/var - /var:/var
- /tmp/etc:/etc - /tmp/etc:/etc

18
src/cmd/infrakit-instance-hyperkit/instance.go
View File

@@ -76,7 +76,7 @@ func (p hyperkitPlugin) Provision(spec instance.Spec) (*instance.ID, error) {
log.Infof("[%s] New instance", id) log.Infof("[%s] New instance", id)
logicalID := string(id) logicalID := string(id)
uuidStr := "" vpnkitKeyStr := ""
diskImage := "" diskImage := ""
if spec.LogicalID != nil { if spec.LogicalID != nil {
@@ -85,12 +85,12 @@ func (p hyperkitPlugin) Provision(spec instance.Spec) (*instance.ID, error) {
// it into a magic UUID which cause VPNKit to assign a // it into a magic UUID which cause VPNKit to assign a
// fixed IP address // fixed IP address
if ip := net.ParseIP(logicalID); len(ip) > 0 { if ip := net.ParseIP(logicalID); len(ip) > 0 {
uuid := make([]byte, 16) vpnkitkey := make([]byte, 16)
uuid[12] = ip.To4()[0] vpnkitkey[12] = ip.To4()[0]
uuid[13] = ip.To4()[1] vpnkitkey[13] = ip.To4()[1]
uuid[14] = ip.To4()[2] vpnkitkey[14] = ip.To4()[2]
uuid[15] = ip.To4()[3] vpnkitkey[15] = ip.To4()[3]
uuidStr = fmt.Sprintf("%x-%x-%x-%x-%x", uuid[0:4], uuid[4:6], uuid[6:8], uuid[8:10], uuid[10:]) vpnkitKeyStr = fmt.Sprintf("%x-%x-%x-%x-%x", vpnkitkey[0:4], vpnkitkey[4:6], vpnkitkey[6:8], vpnkitkey[8:10], vpnkitkey[10:])
} }
// If a LogicalID is supplied and the Disk size is // If a LogicalID is supplied and the Disk size is
// non-zero, we place the disk in a special directory // non-zero, we place the disk in a special directory
@@ -115,7 +115,7 @@ func (p hyperkitPlugin) Provision(spec instance.Spec) (*instance.ID, error) {
} }
log.Infof("[%s] LogicalID: %s", id, logicalID) log.Infof("[%s] LogicalID: %s", id, logicalID)
log.Debugf("[%s] UUID: %s", id, uuidStr) log.Debugf("[%s] VPNKitKey: %s", id, vpnkitKeyStr)
// Start a HyperKit instance // Start a HyperKit instance
h, err := hyperkit.New(p.HyperKit, p.VPNKitSock, instanceDir) h, err := hyperkit.New(p.HyperKit, p.VPNKitSock, instanceDir)
@@ -124,7 +124,7 @@ func (p hyperkitPlugin) Provision(spec instance.Spec) (*instance.ID, error) {
} }
h.Kernel = properties["kernel+initrd"].(string) + "-bzImage" h.Kernel = properties["kernel+initrd"].(string) + "-bzImage"
h.Initrd = properties["kernel+initrd"].(string) + "-initrd.img" h.Initrd = properties["kernel+initrd"].(string) + "-initrd.img"
h.UUID = uuidStr h.VPNKitKey = vpnkitKeyStr
h.DiskImage = diskImage h.DiskImage = diskImage
h.ISOImage = isoImage h.ISOImage = isoImage
h.CPUs = int(properties["CPUs"].(float64)) h.CPUs = int(properties["CPUs"].(float64))