github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-10-16 03:46:37 +00:00
Code Issues Projects Releases Wiki Activity
4,130 Commits 1 Branch 31 Tags
0f725c366e56e4dde9f7b3fce88e929aa43c920d
Commit Graph

178 Commits

Author SHA1 Message Date
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
Ryoga Saito
d12983810f fix that docker.yml wasn't working correctly 
Signed-off-by: Ryoga Saito <proelbtn@gmail.com>
 2017-07-16 21:28:35 +09:00
Justin Cormack
79f9a66027 update init hashes 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-07-15 14:13:25 +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
Justin Cormack
f98a56fc2c Merge pull request #2179 from deitch/read-only-securetty 
Use existing securetty
 2017-07-11 23:19:43 +01:00
Avi Deitcher
5d18cba75f Use existing securetty 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
 2017-07-11 14:43:26 +03:00
Justin Cormack
a5b9464a4e Move ttyS0 after tty0 as it is more common 
This means more users will see console output at boot time.

Remove page poison from example CLIs, we should document this
elsewhere and put in blueprints.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-07-09 19:39:41 +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
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
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
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
Rolf Neugebauer
736713dc8f Merge pull request #2120 from dave-tucker/getty 
Make it more obvious that getty/sshd are namespaced
 2017-06-29 23:30:17 +01:00
Riyaz Faizullabhoy
11e19703a2 Merge pull request #2130 from caminada/master 
Bind /etc/docker/daemon.json in examples/docker.yml
 2017-06-29 14:42:07 -07:00
Daniel Caminada
f298264f63 Bind /etc/docker/daemon.json in examples/docker.yml 
Signed-off-by: Daniel Caminada <daniel.caminada@ergon.ch>
 2017-06-29 19:55:31 +02:00
Justin Cormack
c8a8bb047c Update docker-ce in Yaml files 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-06-29 15:30:45 +01:00
Dave Tucker
71bccd6967 examples: Update to use new getty and sshd images 
Signed-off-by: Dave Tucker <dt@docker.com>
 2017-06-29 15:01:33 +01:00
Riyaz Faizullabhoy
7bf535cafb add vultr example 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-06-28 11:34:46 -07:00
Rolf Neugebauer
093dae22d5 Update YAML files 
- Use the new style kernel tags with the full kernel version
- Update packages with new alpine base and new/simplified Makefiles.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-06-27 19:56:08 +01:00
Ian Campbell
3809391545 test: ensure ctr works in getty container 
This is based on examples/getty.yml modified to drop console=tty0 from the
command line since we will be capturing/logging only the serial so want
everything to go there.

Also updates the getty example to pickup the latest containerd and
ca-certificates as used in the top level linuxkit.yml.

Fix a typo in the containerd test too.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-06-27 12:29:29 +01:00
Ian Campbell
b6071df200 Update getty and sshd sha's in *.yml to current. 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-06-26 11:52:41 +01:00
Ian Campbell
ea79748830 pkg/containerd: Add /etc/localtime set to UTC 
containerd/ctr includes this in the default set of bind mounts for a container.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-06-26 11:52:30 +01:00
Rolf Neugebauer
d3e0898fb7 Update containerd hash in all YAML files 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-06-19 11:04:58 -07:00
Riyaz Faizullabhoy
f3606997da trust: use library org in examples to verify nginx, other official images 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-06-16 10:07:57 -07:00
Ian Campbell
9d2da9cabc Update to containerd c215531a8f63a98a69134e804fea4ee6d354bb90 
This includes https://github.com/containerd/containerd/pull/994 and hence
requires updating the various instances of `/etc/containerd/config.toml`.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-06-16 13:42:24 +01:00
Ian Campbell
d51784adc0 Allow /etc/init.d/010-containerd to exit when complete 
Don't think there is a need for it to remain and it drops an unnecessary
process.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-06-16 11:49:52 +01:00
Ian Campbell
5833d1b6bc init: replace ctr with a custom client using the containerd client library 
Currently it supports only `service start <SERVICE>`, but it could grow e.g.
`stop`, `exec` etc in the future (although you can still use `ctr` for those).

In order to be able to use go-compile.sh the containerd build needs to move
from /root/go to /go as the GOPATH.

The vendoring situation is not ideal, but since this tool wants to be an exact
match for the containerd it seems tollerable to reuse its vendoring.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-06-16 11:48:53 +01:00
Ian Campbell
f7b2a739ee pkg/getty: Stop bind mounting /tmp/ctr 
This doesn't exist with newer ctr or in systems where service containers are
not started using the ctr tool. All it contains today are the stdio FIFOs,
which are not in general useful to access after container creation.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-06-16 11:21:40 +01:00
Justin Cormack
684b77d62b Merge pull request #2048 from MagnusS/vpnkit-docker-ce 
pkg/docker-ce: add vpnkit-expose-port
 2017-06-15 15:18:54 -07:00
Rolf Neugebauer
7e989ca773 Merge pull request #2051 from rn/kup 
kernel update to 4.11.5/4.9.32/4.4.72 + init update
 2017-06-15 15:17:31 -07:00
Magnus Skjegstad
cc59b458f1 Update to latest pkg/docker-ce 
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
 2017-06-15 21:50:07 +01:00
Justin Cormack
32f505469b Merge pull request #2027 from justincormack/mobyup 
Use the user's ssh key automatically in ssh examples
 2017-06-15 13:33:35 -07:00
Rolf Neugebauer
9b6f708fc3 Update init in all YAML files 
The new init adds the usermode helper which is needed with
the soon to be pushed new 4.11 kernel update.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-06-15 13:17:28 -07:00
Justin Cormack
c2f2141473 Use the user's ssh key automatically in ssh examples 
This requires moby tool update to support `~` in paths, but
makes everything much nicer.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-06-15 11:28:25 -07:00
Riyaz Faizullabhoy
6dedac2fe9 Update getty image for setsid changes 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-06-15 09:16:12 -07:00
Rolf Neugebauer
90c441ef67 Update YAML files to new init 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-06-13 15:57:24 -07:00
Riyaz Faizullabhoy
35977c53d6 Merge pull request #2022 from justincormack/sys-in-getty 
mount /sys in getty container and add and fix kernel tests
 2017-06-12 09:29:44 -07:00