github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +00:00
Code Issues Projects Releases Wiki Activity
2,643 Commits 1 Branch 27 Tags 240 MiB
40cc6d8110
Commit Graph

2643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Cormack
40cc6d8110 Merge pull request #1517 from samoht/make-qemu 
Really fix `make qemu`
 2017-04-06 15:14:22 +01:00
Thomas Gazagnaire
7f0761c5f1 Really fix make qemu 
Previously, the cmdline file was never sent in the build context which
caused the script to pick the default options.

Also, when mulitple options are specified (not the default) the right
escaping needs to be used.

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
 2017-04-06 16:05:35 +02:00
Justin Cormack
3223897232 Merge pull request #1514 from rneugeba/cli-up 
Improvements to the CLI
 2017-04-06 13:01:58 +01:00
Justin Cormack
4a1b8a3e32 Merge pull request #1515 from samoht/make-qemu 
Fix `make qemu`
 2017-04-06 12:30:19 +01:00
Rolf Neugebauer
3e53aab4ce cli: Add a 'version' version 
Pass version and git commit hash from the Makefile
into main.go. Add a 'version' subcommand to print
the information.

While at it also tweak the help output to only print the
command name and not the entire path.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-04-06 12:29:52 +01:00
Thomas Gazagnaire
8f64191dee Fix make qemu 
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
 2017-04-06 13:20:33 +02:00
Justin Cormack
6917f6d23a Merge pull request #1488 from t-koulouris/master 
[WIP] Support launching containers in outer-kernel mode for moby-okernel demo
 2017-04-06 11:48:06 +01:00
Rolf Neugebauer
f76f2b6654 tools: Add --ldflags to go-compile 
This flags allows passing additional ldflags to the build.
It is primarily there to pass -C arguments to specify values
of variables at compile time.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-04-06 10:55:18 +01:00
Rolf Neugebauer
d33892e9f8 cli: Fix "build" when the basename contains a "." 
Something like "moby-4.10.yml" did not work when invoked
like "moby build moby-4.10".

While at it, also allow .yaml as an extension.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-04-06 10:55:18 +01:00
Justin Cormack
d740624db6 Merge pull request #1511 from justincormack/oci-add 
Add more OCI options
 2017-04-06 10:23:47 +01:00
Justin Cormack
f129645c23 Merge pull request #1505 from ijc25/use-exec-to-avoid-stale-sh-processes 
Use exec in a couple of places to avoid needless lingering /bin/sh pr…
 2017-04-06 10:12:54 +01:00
Justin Cormack
7b1e0be404 Merge pull request #1513 from justincormack/del-extra-dtakit 
remove unnecessary .datakitci.json
 2017-04-06 10:09:54 +01:00
Ian Campbell
2b54e18f9f Drop unnecessary use of start-stop-daemon with containerd. 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-04-06 09:34:38 +01:00
Ian Campbell
8270bdfe33 Use exec in a couple of places to avoid needless lingering /bin/sh processes 
```
$ apk -U add procps
$ ps xf
    1 ?        Ss     0:05 /sbin/init
  357 ?        Ss     0:00 /bin/sh /etc/init.d/containerd
  359 ?        Sl     0:00  \_ /usr/bin/containerd
  360 ?        Ss     0:00 /bin/sh /etc/init.d/containers
  432 ?        Sl     0:00  \_ /usr/bin/runc run --bundle /containers/daemon/swa
  466 ?        Ssl    0:00  |   \_ /usr/bin/swarmd --containerd-addr=/run/contai
  427 ?        Sl     0:00  \_ /usr/bin/runc run --bundle /containers/daemon/dhc
  457 ?        Ss     0:00  |   \_ bin/sh /usr/local/bin/start_dhcpcd.sh
  474 ?        S      0:00  |       \_ /sbin/dhcpcd --nobackground
  429 ?        Sl     0:00  \_ /usr/bin/runc run --bundle /containers/daemon/rng
  576 ?        Ss     0:00      \_ /bin/tini /usr/sbin/rngd -f
  580 ?        S      0:00          \_ /usr/sbin/rngd -f
```

becomes

```
$ ps xf
    1 ?        Ss     0:06 /sbin/init
  358 ?        Ss     0:00 /bin/sh /etc/init.d/containers
  426 ?        Sl     0:00  \_ /usr/bin/runc run --bundle /containers/daemon/dhc
  458 ?        Ss     0:00  |   \_ /sbin/dhcpcd --nobackground
  431 ?        Sl     0:00  \_ /usr/bin/runc run --bundle /containers/daemon/swa
  460 ?        Ssl    0:00  |   \_ /usr/bin/swarmd --containerd-addr=/run/contai
  428 ?        Sl     0:00  \_ /usr/bin/runc run --bundle /containers/daemon/rng
  574 ?        Ss     0:00      \_ /bin/tini /usr/sbin/rngd -f
  578 ?        S      0:00          \_ /usr/sbin/rngd -f
  356 ?        Ssl    0:00 /usr/bin/containerd

```

Specifically these are gone:
  357 ?        Ss     0:00 /bin/sh /etc/init.d/containerd
  457 ?        Ss     0:00  |   \_ bin/sh /usr/local/bin/start_dhcpcd.sh

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-04-06 09:34:38 +01:00
Justin Cormack
106d769d0e remove unnecessary .datakitci.json 
Confusing to have it, we are not using variants now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-04-05 23:57:17 +01:00
Rolf Neugebauer
fa7c85e235 build: Improve dependency for CLI/infrakit build 
Use vendor.conf as a proxy for ./vendor contents

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-04-05 23:10:08 +01:00
Justin Cormack
ea75bd96b6 Merge pull request #1510 from riyazdf/sec-arch-feedback 
Update security arch docs with feedback
 2017-04-05 20:50:31 +01:00
Justin Cormack
316fe5da79 Add more OCI options 
- Sysctl
- CgroupsPath
- RootfsPropagation

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-04-05 20:46:16 +01:00
Rolf Neugebauer
df993d8b0d build: Fix copy&paste error for Infrakit dependencies 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-04-05 19:52:31 +01:00
Riyaz Faizullabhoy
5fe0233dad Update security arch docs with feedback 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-04-05 11:29:07 -07:00
Rolf Neugebauer
466f59189a Merge pull request #1508 from rneugeba/meta 
Allow passing LogicalIDs into hyperkit instances
 2017-04-05 18:11:12 +01:00
Rolf Neugebauer
df5c858d38 demo: Use IP addresses as Logical IDs in etcd infrakit config 
Instead of specifying the number of instances, provide a list
of IP addresses for instances. These are passed to the instance
plugin as LogicalID.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-04-05 18:01:52 +01:00
Rolf Neugebauer
ea3bfccf5e infrakit: Fix LogicalID handling in HyperKit plugin 
InfraKit may pass an optional LogicalID into an instance. It expects
this LogicalID to be returned via DescribeInstances(). If they don't
match, it assumes something is wrong.

Here, we use the LogicalID passed in (or construct one based on
the internal ID) and stash it in the state directory. It is retrieved
in DescribeInstances().

While at it, also improve logging.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-04-05 18:01:52 +01:00
Riyaz Faizullabhoy
a6257844d1 Merge pull request #1506 from justincormack/gcp-indent 
Fix indentation in examples/gcp.yml
 2017-04-05 09:05:05 -07:00
Justin Cormack
c21996fc0b Fix indentation in examples/gcp.yml 
Yaml is fussy...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-04-05 16:24:03 +01:00
Justin Cormack
4516d360ed Merge pull request #1492 from dave-tucker/gcp 
Add gcp backend for moby run
 2017-04-05 15:17:01 +01:00
Justin Cormack
50c1bd9df3 Merge pull request #1500 from justincormack/mount-overrides 
Allow overriding the default mount options
 2017-04-05 15:13:06 +01:00
Justin Cormack
3bffae8fe7 Allow overriding the default mount options 
This refactors the mount handling, without changing any defaults.

Any specification of a mount destination will override the default,
so if you want to make `sysfs` read only you can add

```
mounts:
  - type: sysfs
    options: ["ro"]
```

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-04-05 15:00:13 +01:00
Dave Tucker
df340fd559 vendor: Add GCP dependencies and update crypto 
Signed-off-by: Dave Tucker <dt@docker.com>
 2017-04-05 14:50:28 +01:00
Dave Tucker
db10280f5f run: Add gcp backend 
This commit implements `moby run gcp` which allows for testing of moby
images on the Google Cloud Platform

This backend attaches (via SSH) to the serial console.
It generates instance-only SSH keys and adds the public key to the
image metadata. These are used by the `moby` tool only.

It will also automatically upload a file and creates an image if the prefix
given to `moby run` is a filename

Signed-off-by: Dave Tucker <dt@docker.com>
 2017-04-05 14:50:23 +01:00
Dave Tucker
d5a8e23cdd build: Use older GCP API and support service account auth 
This commit uses the older GCP API as it supports both compute and
storage. As a result, we can now use either Application Default
Credentials that are generated using the `gcloud` tool or by supplying the
service account credentials in JSON format

Signed-off-by: Dave Tucker <dt@docker.com>
 2017-04-05 14:50:16 +01:00
Rolf Neugebauer
d50cc4dbeb Merge pull request #1501 from justincormack/ktar 
Fix typo that meant modules were missing from image
 2017-04-05 13:37:15 +01:00
Justin Cormack
f3a58b04f2 Fix typo that meant modules were missing from image 
fix #1393 thanks @deitch

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-04-05 13:24:42 +01:00
Justin Cormack
3e8e557cda Merge pull request #1496 from justincormack/all-caps 
Allow setting capabilities to "all"
 2017-04-05 13:04:26 +01:00
Justin Cormack
e2a441be23 Merge pull request #1497 from justincormack/proc-options 
Add the standard options Docker sets for /proc
 2017-04-05 12:21:52 +01:00
Justin Cormack
297f41e25a Add the standard options Docker sets for /proc 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-04-05 11:52:17 +01:00
Justin Cormack
0655252add Allow setting capabilities to "all" 
This adds every capability. We had this before the OCI changes as we
passed these values to Docker. Makes fully privileged containers less verbose.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-04-05 11:18:46 +01:00
Rolf Neugebauer
dd58bd75eb Merge pull request #1495 from rneugeba/demo-up 
Update demo project
 2017-04-05 11:12:28 +01:00
Justin Cormack
59969bcd27 Merge pull request #1494 from ijc25/swarmd-dhcp-container 
swarmd: Switch to DHCPD container
 2017-04-05 11:11:47 +01:00
Rolf Neugebauer
a131ee823b demo: Update YAML files to include DHCP 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-04-05 11:08:48 +01:00
Rolf Neugebauer
1cb8dfc222 demo: Remove infrakit example. 
This is superseded by the etcd infrakit setup now in place.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-04-05 11:07:39 +01:00
Justin Cormack
ef79efee6e Merge pull request #1493 from ijc25/dhcp-oom-score-adj 
Update example DHCP containers with oom_score_adj -> oomScoreAdj
 2017-04-05 10:54:19 +01:00
Ian Campbell
f01d77930c swarmd: Switch to DHCPD container 
Follows on from #1316, copies stanza from moby.yml but also picks up update
from #1493.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-04-05 10:39:04 +01:00
Ian Campbell
decc6b46ff Update example DHCP containers with oom_score_adj -> oomScoreAdj 
Looks like this was missed when #1316 was rebased over #1474.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-04-05 10:28:13 +01:00
Justin Cormack
55092ce7f1 Merge pull request #1473 from riyazdf/sign-kernel-img 
Sign mobylinux/kernel image on make push
 2017-04-04 23:04:57 +01:00
Justin Cormack
b31c601fb1 Merge pull request #1316 from riyazdf/dhcpcd-container 
dhcpcd system container
 2017-04-04 18:30:56 +01:00
Justin Cormack
bc0feab1c9 Merge pull request #1476 from riyazdf/make-cleaner 
Make clean cleaner, and ignore more output disks
 2017-04-04 17:23:12 +01:00
Justin Cormack
a97db7b406 Merge pull request #1487 from rneugeba/ik 
Update InfraKit
 2017-04-04 17:22:44 +01:00
Rolf Neugebauer
8225f34631 Merge pull request #1486 from ijc25/swarmd 
swarmd: use standard init
 2017-04-04 16:45:05 +01:00
Theo Koulouris
f6c85a9980 build file fixes for okernel 
Signed-off-by: Theo Koulouris <theo.koulouris@hpe.com>
 2017-04-04 16:44:26 +01:00