Commit Graph

42 Commits

Author SHA1 Message Date
Rolf Neugebauer
7ccc2786ae Update kernel version in all YAML files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-24 11:05:40 +01:00
Avi Deitcher
afc1e1e970 Updated hashes for getty and sshd
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-21 19:16:38 +03:00
Ian Campbell
d01aa72670 Update ymls
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-20 15:08:27 +01:00
Justin Cormack
5545f3085a Merge pull request #2258 from ijc/containerd-v1.0.0-alpha1
Containerd v1.0.0 alpha1
2017-07-20 15:07:24 +01:00
Ian Campbell
19207bb81b Update yml and moby version
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-20 14:13:20 +01:00
David Scott
13ff6d5d94 Update to linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79
Signed-off-by: David Scott <dave.scott@docker.com>
2017-07-20 11:24:18 +01:00
Avi Deitcher
0f725c366e Merge pull request #2241 from deitch/fix-getty-background
flag in init and background only if not in init
2017-07-18 21:39:53 +03:00
Justin Cormack
09e9357499 Merge pull request #2235 from justincormack/use-library-docker
Use the upstream dind package to run docker
2017-07-18 17:27:45 +01:00
Avi Deitcher
03244e3776 Change hash for getty in examples
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-18 17:47:36 +03:00
Justin Cormack
ae039ac141 update hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-18 14:22:16 +01:00
Justin Cormack
a4650b242f Use the upstream dind package to run docker
It is pretty close to our docker package, if we adjust the command
that is run to avoid the actual dind startup script. We can't use
the normal docker image as it does not have mkfs and so on.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-18 11:15:38 +01:00
Rolf Neugebauer
fcac29681b Update kernels in YAML files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-17 11:04:18 +01:00
Justin Cormack
79f9a66027 update init hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-15 14:13:25 +01:00
Justin Cormack
07469ac60b Merge pull request #2207 from justincormack/getty-x
remove -x from getty script
2017-07-15 12:38:52 +01:00
Justin Cormack
b0800cba59 update getty hash
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 18:38:36 +01:00
Riyaz Faizullabhoy
469ba103db Merge pull request #2209 from ijc/expurgate-set--x
pkg/mount: Remove set -x
2017-07-14 09:58:36 -07:00
Justin Cormack
497122126f update runc hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 15:54:11 +01:00
Ian Campbell
0fbea002dc Update yml
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-14 15:21:09 +01:00
Ian Campbell
074431eebe Update yml to linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-14 13:53:51 +01:00
Justin Cormack
f8a0b332f2 Update hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-14 11:08:50 +01:00
Ian Campbell
fa1ac99dfb Update yml's to linuxkit/containerd:389e67c3c1fc009c1315f32b3e2b6659691a3ad4
Only those which used the same value as linuxkit.yml are updated.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-13 10:45:45 +01:00
Ian Campbell
a2d3be0e6f Update runc and containerd
pull in newer containerd v1.0.0-alpha0 via updated alpine base, update runc to
429a5387123625040bacfbb60d96b1cbd02293ab which is vendored by that version of
containerd (and also update alpine base for runc)

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-07-13 10:37:15 +01:00
Riyaz Faizullabhoy
f5ab0aeb2b Merge pull request #2182 from MagnusS/move-logs-to-disk
dfm: Move logs from memory to disk
2017-07-10 11:18:11 -07:00
Magnus Skjegstad
9daca681a1 blueprints, dfm: move logs, mount disk in /var/lib
This mounts the disk image in /var/lib (instead of /var/lib/docker) and
moves the logs to /var/lib/log. This is to have the logs on disk until
we have a better solution in place.

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-10 16:03:08 +01:00
Justin Cormack
ccbdde0f5c Remove rngd from Mac blueprint
Hyperkit sets up PV entropy driver, so we do not need `rngd`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-10 15:46:45 +01:00
Magnus Skjegstad
20eaf62df1 blueprints: only bind mount /port once in dfm blueprint
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-10 15:22:47 +01:00
Justin Cormack
298f4aab32 Consistently don't use quotes around image names
These are not needed, but we are inconsistent. Been waiting for a
quiet moment to fix this since I noticed while doing a presentation...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-09 17:47:30 +01:00
Rolf Neugebauer
561c204de6 Merge pull request #2167 from rn/kern-up
Update kernel to 4.11.9/4.9.36/4.4.76
2017-07-07 19:48:24 +01:00
Rolf Neugebauer
c3bc803445 Merge pull request #2164 from rn/meta
Allow metadata package to over write existing config files
2017-07-07 19:48:09 +01:00
Rolf Neugebauer
4e19cf363a Merge pull request #2119 from djs55/host-timesync-daemon
Add Docker for Mac host time sync daemon
2017-07-07 19:17:20 +01:00
Rolf Neugebauer
dca5671fc1 Update kernel version in all YAML files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-07 18:41:33 +01:00
Rolf Neugebauer
6147b0a592 Update all YAML files to latest metadata package.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-07 18:30:10 +01:00
David Scott
c9de2fb2a5 blueprints/docker-for-mac.yml: add host-timesync-daemon
This adds the helper program which resynchronises the VM's clock after
a host resume.

Signed-off-by: David Scott <dave.scott@docker.com>
2017-07-07 17:12:12 +01:00
Magnus Skjegstad
1d9f582a48 blueprints: add acpi support to dfm blueprint
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-06 12:02:08 +02:00
Magnus Skjegstad
c28704e79d blueprints: add metadata to dfm blueprint
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-07-06 12:01:06 +02:00
Justin Cormack
779fdc9499 Update init and containerd hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-03 14:51:23 +01:00
Rolf Neugebauer
89c40eaddb Update hashes in YAML files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-01 19:24:16 +01:00
Justin Cormack
58201d3d3c Merge pull request #2124 from MagnusS/add-vpnkit-init
DfM: Add support for exposing swarm service ports
2017-07-01 10:52:57 +01:00
Magnus Skjegstad
b2439251dd blueprints: update docker-for-mac.yml to latest vpnkit packages
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-06-30 19:35:30 +02:00
Rolf Neugebauer
4c6e0264b9 Update kernels in YAML files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-30 18:23:29 +01:00
Magnus Skjegstad
fcf12d9f5a dfm blueprint: use same port as DfM
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-06-30 16:03:20 +02:00
Magnus Skjegstad
0d3c6d124f blueprints: split dfm blueprint into base and docker yml
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-06-30 15:41:03 +02:00