Commit Graph

2486 Commits

Author SHA1 Message Date
Riyaz Faizullabhoy
d6e9a1c2b7 Merge pull request #1290 from riyazdf/ro-system-containers
Add read-only option to containers, apply to all except nginx
2017-03-13 16:23:44 +00:00
Justin Cormack
da3559aa20 Merge pull request #1294 from justincormack/ssh
Add a WIP example to run sshd
2017-03-13 16:23:06 +00:00
Justin Cormack
1a80011a4c Merge pull request #1296 from ijc25/q35-and-kvm
qemu: Enable KVM support and switch to Q35
2017-03-13 15:55:16 +00:00
Riyaz Faizullabhoy
0517cb6346 Merge pull request #1293 from justincormack/ipc-typo
Fix typo/copy paste for IPC namespaces
2017-03-13 15:52:58 +00:00
Riyaz Faizullabhoy
cb7ccb491d Add read-only option to containers, apply to all except nginx
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-03-13 15:51:03 +00:00
Ian Campbell
0dbb1e6e97 qemu: Enable KVM support and switch to Q35
Passing accel=kvm:tcg causes it to try KVM first if available with a fallback
to TCG (emulated/JIT mode) if it is not available. With this the boot logs gain:

+Hypervisor detected: KVM

and also

-Booting paravirtualized kernel on bare hardware
+Booting paravirtualized kernel on KVM

Among various other noise.

If I rename my host /dev/kvm then this is reversed, although with the following
message:

  Could not access KVM kernel module: No such file or directory
  failed to initialize KVM: No such file or directory
  Back to tcg accelerator.

Q35 is a more modern emulated platform based on the ICH9 host chipset rather
than the default "pc" I440FX (Pentium Pro / Pentium II era) emulation. See
http://wiki.qemu-project.org/Features/Q35 for more info. Switching to Q35 is
not a requirement for enabling KVM but seemed like a reasonable change.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-03-13 15:39:08 +00:00
Justin Cormack
453bec56c5 Add a WIP example to run sshd
- Currently only works if you add your ssh key in the example yaml, but will replace
with metadata support shortly.
- sshd logging not yet configured (needs to share syslog socket).

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-13 15:19:54 +00:00
Justin Cormack
0d3e7dd672 Fix typo/copy paste for IPC namespaces
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-13 15:00:22 +00:00
Justin Cormack
6a4feb3702 Merge pull request #1291 from riyazdf/cleanup-tests
Remove unused test bits
2017-03-13 14:15:30 +00:00
Riyaz Faizullabhoy
5c1662b1c1 Remove unused test bits
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-03-13 12:06:24 +00:00
Riyaz Faizullabhoy
bbc3f076a5 Merge pull request #1289 from justincormack/fix-docker
Fix build of Docker container
2017-03-13 11:38:44 +00:00
Justin Cormack
150bf80954 Fix build of Docker container
- rename it `docker-ce` to make it clearer.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-13 11:32:37 +00:00
Justin Cormack
bafed87ead Merge pull request #1287 from rneugeba/kern-up
kernel: Update to 4.9.14/4.4.53
2017-03-13 11:31:48 +00:00
Rolf Neugebauer
ed76cfc999 kernel: Update yaml files to latest kernel
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-13 11:25:39 +00:00
Justin Cormack
9d8977a367 Merge pull request #1288 from riyazdf/readme-format-and-nit
Update README formatting and some additional info
2017-03-13 10:55:34 +00:00
Riyaz Faizullabhoy
acc762d8c9 docs: update README formatting and some additional info
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-03-13 10:46:58 +00:00
Rolf Neugebauer
adff125b28 Merge pull request #1286 from riyazdf/weeklyreport-nit
reports: nit typo fixes
2017-03-13 10:31:57 +00:00
Rolf Neugebauer
1c10c56138 kernel: Update to 4.9.14/4.4.53
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-13 10:26:28 +00:00
Riyaz Faizullabhoy
0fa083b3df reports: nit typo fixes
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-03-13 10:23:21 +00:00
Justin Cormack
b6c5cdec05 Merge pull request #1283 from justincormack/report-12mar
First weekly report, for 12 March 2017
2017-03-12 12:56:04 +00:00
Justin Cormack
c74ff7b4e7 First weekly report, for 12 March 2017
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-12 12:25:58 +00:00
Justin Cormack
b8ae3a5803 Merge pull request #1281 from justincormack/sysctl-extras
Add default Alpine sysctl settings back
2017-03-10 17:28:03 +00:00
Justin Cormack
d7e5940027 Merge pull request #1280 from justincormack/dashdash
Fix cut and paste typo in startup code
2017-03-10 17:27:52 +00:00
Justin Cormack
a64e456320 Add default Alpine sysctl settings back
- these were set via the Alpine config file previously.
- removed `kernel.panic` as we have decided to avoid reboot on panic.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-10 17:15:40 +00:00
Justin Cormack
cbd1742b6f Fix cut and paste typo in startup code
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-10 17:13:16 +00:00
Justin Cormack
519b5db338 Merge pull request #1278 from justincormack/containerd-up
Update containerd
2017-03-10 16:51:52 +00:00
Justin Cormack
38335ce204 Merge pull request #1279 from justincormack/qcow
Add qcow2 output support
2017-03-10 16:44:12 +00:00
Justin Cormack
054c3b08a3 Add qcow2 output support
- outputs compressed qcow2 image
- 1GB underlying size, may need changing

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-10 16:38:37 +00:00
Justin Cormack
5c19da6fa3 Merge pull request #1277 from justincormack/vhd
Add VHD and GCE output formats
2017-03-10 16:13:23 +00:00
Justin Cormack
2eb0fe7d04 Merge pull request #1276 from rneugeba/infra-iso
infrakit: Pass config information to VM via an ISO
2017-03-10 16:12:01 +00:00
Justin Cormack
718d45bdf5 Add VHD and GCE output formats
- VHD is uncompressed VHD. Currently hard coded at 1GB, which may need to change. Use `format: vhd`
- GCE is the GCE compressed tarred raw image. Use `format: gce-img` - reserving `gce` for actually
  uploading the image.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-10 16:10:48 +00:00
Justin Cormack
00bd8a42d3 Update containerd
- in a much better state than previous commit, but still some issues
running system containers with it that need more work, so staying with `runc`.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-10 16:07:44 +00:00
Rolf Neugebauer
562bc65dec infrakit: Attach ISO file to VM if it exists
The file can me mounted in the VM as /dev/sr0

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-10 14:55:23 +00:00
Rolf Neugebauer
cde6fb9309 infrakit: Write ISO file from instance init contents
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-10 14:24:18 +00:00
Justin Cormack
edcb5a8e83 Merge pull request #1274 from samoht/runc
Update runc
2017-03-10 13:24:17 +00:00
Thomas Gazagnaire
39d9f504c9 Update runc
Update to opencontainers/runc@49a33c41f8

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-03-10 14:19:41 +01:00
Justin Cormack
c7d1438128 Merge pull request #1264 from tych0/hoist-kernel-cmdline
Hoist kernel cmdline
2017-03-09 22:34:30 +00:00
Tycho Andersen
1504c9584e better debugging output in more error cases
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-03-09 14:29:40 -08:00
Tycho Andersen
a383e6bb46 hoist kernel cmdline into moby.yaml
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-03-09 14:29:40 -08:00
Justin Cormack
57355aa813 Merge pull request #1271 from rneugeba/infra-up
infrakit: Fix detection of running proceses
2017-03-09 22:13:26 +00:00
Rolf Neugebauer
0f7807e48d infrakit: Fix detection of running proceses
os.FindProcess() does not return an error when then process does not
exist. It even returns a dummy process object.

Use the go-ps package to find out if the hyperkit process is actually
running.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-09 22:08:44 +00:00
Justin Cormack
83852ec5b6 Merge pull request #1270 from justincormack/go-strip
Strip Go files to make them a bit smaller
2017-03-09 19:21:10 +00:00
Tycho Andersen
8a3ae66f64 hoist kernel command line out of qemu docker image
we want to fiddle with this for selinux, and probably for other things too.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-03-09 11:13:49 -08:00
Justin Cormack
154c3516b2 Strip Go files to make them a bit smaller
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-09 15:30:15 +00:00
Justin Cormack
5aa5852eb0 Merge pull request #1269 from justincormack/sysctl
Add in sysctl container
2017-03-09 14:55:49 +00:00
Justin Cormack
bf41a668d7 Add in sysctl container
- based on @riyazdf earlier unmerged Go version 891c006d34/alpine/containers/cloud-config/main.go

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-09 14:41:19 +00:00
Justin Cormack
83c052f74c Merge pull request #1268 from justincormack/no-wait-ctr
Do not wait for containerd to be ready, as not using it yet
2017-03-09 14:41:05 +00:00
Justin Cormack
7c2ee209e8 Do not wait for containerd to be ready, as not using it yet
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-09 14:37:28 +00:00
Justin Cormack
534667b281 Merge pull request #1267 from justincormack/no-licensing
Remove licensing directory
2017-03-09 12:21:34 +00:00
Justin Cormack
ccad5ccd49 Remove licensing directory
We are not going to do any closed source releases of this code so
we can remove the licensing used for editions GPL compliance.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-09 12:08:03 +00:00