Commit Graph

2443 Commits

Author SHA1 Message Date
Justin Cormack
daa63abd22 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
14a03ec5a2 Merge pull request #1291 from riyazdf/cleanup-tests
Remove unused test bits
2017-03-13 14:15:30 +00:00
Riyaz Faizullabhoy
eeae1d9630 Remove unused test bits
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-03-13 12:06:24 +00:00
Riyaz Faizullabhoy
72bc9cd961 Merge pull request #1289 from justincormack/fix-docker
Fix build of Docker container
2017-03-13 11:38:44 +00:00
Justin Cormack
8517b975d5 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
1f98c2bd17 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
d78d0509cc 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
402014122f 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
dc87454c55 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
44fbcc15f3 Merge pull request #1286 from riyazdf/weeklyreport-nit
reports: nit typo fixes
2017-03-13 10:31:57 +00:00
Rolf Neugebauer
139c48db9a 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
638526e88b reports: nit typo fixes
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-03-13 10:23:21 +00:00
Justin Cormack
0445bc7dbd 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
96aef3af61 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
4f9974e243 Merge pull request #1281 from justincormack/sysctl-extras
Add default Alpine sysctl settings back
2017-03-10 17:28:03 +00:00
Justin Cormack
5057ff7ee6 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
3823d50654 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
54483effea 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
857599a609 Merge pull request #1278 from justincormack/containerd-up
Update containerd
2017-03-10 16:51:52 +00:00
Justin Cormack
dfd7b62721 Merge pull request #1279 from justincormack/qcow
Add qcow2 output support
2017-03-10 16:44:12 +00:00
Justin Cormack
e30489fb77 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
9ebc11034a Merge pull request #1277 from justincormack/vhd
Add VHD and GCE output formats
2017-03-10 16:13:23 +00:00
Justin Cormack
e344980fd3 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
41fac88bf6 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
a2fe3ce391 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
7d03bd8c3e 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
4bfbe8ad5d 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
a6a3bb8ba3 Merge pull request #1274 from samoht/runc
Update runc
2017-03-10 13:24:17 +00:00
Thomas Gazagnaire
166f2b2ccf 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
6122a483dc Merge pull request #1264 from tych0/hoist-kernel-cmdline
Hoist kernel cmdline
2017-03-09 22:34:30 +00:00
Tycho Andersen
a6c5dbf8f5 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
e8319f6761 hoist kernel cmdline into moby.yaml
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-03-09 14:29:40 -08:00
Justin Cormack
9d3eaefd93 Merge pull request #1271 from rneugeba/infra-up
infrakit: Fix detection of running proceses
2017-03-09 22:13:26 +00:00
Rolf Neugebauer
d6d2162999 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
3d93c723f5 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
81a439751b 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
4170897db0 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
bd2cd62017 Merge pull request #1269 from justincormack/sysctl
Add in sysctl container
2017-03-09 14:55:49 +00:00
Justin Cormack
681ed3f37d 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
f2419e9e18 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
eefa303497 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
8da4d381fb Merge pull request #1267 from justincormack/no-licensing
Remove licensing directory
2017-03-09 12:21:34 +00:00
Justin Cormack
7ee38c61fb 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
Justin Cormack
879b6a97cb Merge pull request #1259 from rneugeba/kern-doc
docs: Update kernel patches documentation
2017-03-08 00:11:10 +00:00
Justin Cormack
c86bc7276a Merge pull request #1260 from justincormack/docker-container2
Add Docker container
2017-03-08 00:07:56 +00:00
Justin Cormack
ae9bda484d Merge pull request #1261 from justincormack/kernel-push
Add back code to push kernel to hub
2017-03-08 00:04:29 +00:00
Justin Cormack
d26769b219 Add back code to push kernel to hub
- Accidentally removed from top level Makefile, now in kernel Makefile.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-07 23:48:46 +00:00
Justin Cormack
933c826d74 Add Docker container
- need to format filesystem before testing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-07 21:37:07 +00:00
Rolf Neugebauer
71b05400a4 docs: Update kernel patches documentation
Make the process and the requirements for patches clearer.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-07 19:42:23 +00:00
Justin Cormack
3a6fdc5d76 Merge pull request #1258 from tych0/better-debugging
better debugging output in some error cases
2017-03-07 19:07:05 +00:00