Commit Graph

8478 Commits

Author SHA1 Message Date
Justin Cormack
f73558a98a Add a -dir option for location of output files
Fix #17

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-26 14:53:17 +01:00
Justin Cormack
5de12a0085 Merge pull request #46 from justincormack/gitignore
Fix gitignore to not ignore moby directory
2017-05-26 14:47:45 +01:00
Justin Cormack
27709ce1c0 Fix gitignore to not ignore moby directory
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-26 14:45:19 +01:00
Justin Cormack
48923d36a3 Merge pull request #1908 from justincormack/outputs
Remove outputs from the yaml files
2017-05-26 14:22:04 +01:00
Justin Cormack
00737bd859 Remove outputs from the yaml files
The latest version of the `moby` tool now requires that the output formats
be specified in the CLI not in the yaml file.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-26 13:55:06 +01:00
Justin Cormack
1cb9fab3e1 Merge pull request #45 from justincormack/clean
Add make clean, .gitignore
2017-05-26 13:34:06 +01:00
Justin Cormack
f6b9076649 Merge pull request #43 from justincormack/outputs-not-in-yaml
Remove output formats from the Yaml file, put in CLI
2017-05-26 13:33:17 +01:00
Justin Cormack
cbbedbfc57 Remove output formats from the Yaml file, put in CLI
This removes outputs from yaml, instead you can do
```
moby build -output tar -output qcow2 file.yaml
```
or alternative syntax
```
moby build -output tar,qcow2 file.yaml
```

In future we may change this to be available in a `moby package`
step, but lets try this for now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-26 13:00:45 +01:00
Rolf Neugebauer
d97d98dd0d Merge pull request #1907 from MagnusS/add-vpnkit-sock
linuxkit: add -vpnkit-socket flag
2017-05-26 12:51:40 +01:00
Justin Cormack
dfd1cd9c1c Add make clean, .gitignore
Also tidy Makefile a bit

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-26 12:47:06 +01:00
Magnus Skjegstad
938091c9fb linuxkit: add -vpnkit-socket flag
Add a new flag to set the VPNKit ethernet socket path. Defaults to the
standard location for the socket in Docker for Mac.

This flag can be used to connect to the VPNKit instance started by
another linuxkit VM launched with `-start-vpnkit`. VMs connected to the
same VPNKit instance will be on the same virtual internal network.

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-05-26 13:06:26 +02:00
Justin Cormack
f65146c844 Merge pull request #41 from riyazdf/remove-run
Remove docker run function as it is unused
2017-05-26 10:43:56 +01:00
Justin Cormack
ff4a19c5fb Merge pull request #44 from AkihiroSuda/fix-tmpfs
config: fix tmpfs parsing
2017-05-26 10:42:22 +01:00
Rolf Neugebauer
df141841c5 Merge pull request #1891 from MagnusS/add-9p-linuxkit
Add -start-vpnkit flag to linuxkit run hyperkit
2017-05-26 10:34:59 +01:00
Rolf Neugebauer
1e0a3a18dc Merge pull request #1900 from riyazdf/more-signing
More signing!
2017-05-26 10:00:06 +01:00
Akihiro Suda
41c536908d config: fix tmpfs parsing
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-05-26 08:24:48 +00:00
Magnus Skjegstad
9c4dc38883 linuxkit: add -start-vpnkit flag
Adds a flag to launch a new vpnkit instance. This enables port
forwarding via a 9p mount (tag:port) if the guest supports it. Vsock
port 62373 is also opened so vpnkit can forward connections back to the
guest.

If -start-vpnkit is not specified HyperKit will connect to the
vpnkit instance managed by Docker for Mac, as before.

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-05-26 10:09:21 +02:00
Rolf Neugebauer
12a0a46796 Merge pull request #1903 from riyazdf/agenda-update
Add buildchain security to agenda, proposed time allocations
2017-05-26 07:30:08 +01:00
Rolf Neugebauer
935fc18d8d Merge pull request #1899 from riyazdf/sig-typo
sig-security: Fix link to ima-namespace project
2017-05-26 07:29:09 +01:00
Riyaz Faizullabhoy
a1c312fd0e Add buildchain security to agenda, proposed time allocations
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-25 15:14:47 -07:00
Riyaz Faizullabhoy
c06f0547b1 Include brief primer doc on signing
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-25 11:06:08 -07:00
Riyaz Faizullabhoy
05f1c282d5 Update images that have been newly setup for signing to use content trust on push
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-25 11:06:08 -07:00
Riyaz Faizullabhoy
3950d8fb82 sig-security: Fix link to ima-namespace project
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-25 10:44:36 -07:00
thebsdbox
58829874d1 open-vm-tools package/documentation
Signed-off-by: Dan Finneran <daniel.finneran@gmail.com>
2017-05-25 16:15:15 +01:00
Justin Cormack
905ded081e Merge pull request #1896 from justincormack/mkimage
Add a mkimage package
2017-05-25 14:26:08 +01:00
Justin Cormack
4faf0c86bc Add a test for mkimage
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-25 13:57:48 +01:00
Justin Cormack
b46084695f Add a mkimage package
This will replace the tools/mkimage-* Docker images.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-25 13:57:48 +01:00
Justin Cormack
d8f0e7529b Merge pull request #1882 from thebsdbox/vcenter_run
VMware vCenter run capability
2017-05-25 10:21:39 +01:00
thebsdbox
6fe7d0e66f Adding of VMware govmomi to vendors
Signed-off-by: Dan Finneran <daniel.finneran@gmail.com>
2017-05-25 08:48:48 +01:00
Riyaz Faizullabhoy
67d021ad46 Merge pull request #1894 from riyazdf/sig-video
sig-security: Add video recording to meeting notes
2017-05-24 13:35:41 -07:00
Riyaz Faizullabhoy
abd52cd725 Merge pull request #1893 from riyazdf/2017-06-07-sig-agenda
sig-security: add draft agenda for 2017-06-07 meeting
2017-05-24 13:08:47 -07:00
Riyaz Faizullabhoy
3230fd4a30 also fix typo
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-24 13:08:15 -07:00
Riyaz Faizullabhoy
48a4376517 sig-security: Add video recording to meeting notes
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-24 11:52:20 -07:00
Riyaz Faizullabhoy
47b31f5aae Merge pull request #1892 from tych0/sig-security-2017-05-24
sig-security: 2017-05-24 meeting notes
2017-05-24 11:26:28 -07:00
Riyaz Faizullabhoy
e0457dd8be security-sig: add draft agenda for 2017-06-07 meeting
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-24 11:02:55 -07:00
Tycho Andersen
dfbbfee3b5 fixes from review
* make each relevant heading a link
* HP->HPE, fix spelling of Arxan
* add mainline linuxkit insecure blurb

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-24 11:35:14 -06:00
thebsdbox
1e6243357f VMware vCenter run capability
Signed-off-by: Dan Finneran <daniel.finneran@gmail.com>
2017-05-24 18:35:01 +01:00
Tycho Andersen
020c84d01f sig-security: 2017-05-24 meeting notes
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-24 11:04:44 -06:00
Magnus Skjegstad
32ee53f14e vendor: Update hyperkit to latest version
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-05-24 18:43:22 +02:00
Justin Cormack
5500302ba5 Merge pull request #1890 from justincormack/collective-responsibility
Remove AUTHOR from tests
2017-05-24 16:57:37 +01:00
Justin Cormack
41422b3057 Remove AUTHOR from tests
This goes against collective responsibility for code. If you want to know the
author use git.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-24 16:33:09 +01:00
Rolf Neugebauer
f02efdccc5 Merge pull request #1888 from rneugeba/qemu
cmd: Unify disk command line options for local hypervisors
2017-05-24 16:28:59 +01:00
Justin Cormack
8d97247d8c Merge pull request #1877 from tych0/real-kernel-config-impl
kernel-config project: add a real implementation of kernel configs
2017-05-24 16:16:33 +01:00
Justin Cormack
6b54f43c4c Merge pull request #1885 from tych0/CVE-2017-1000363
docs: add a blurb about CVE-2017-1000363
2017-05-24 16:08:14 +01:00
Rolf Neugebauer
f90fde5a6f cmd: Unify disk command line options for local hypervisors
- '-disk-size' is now defaults to MB (but can be GB when appending 'G')
- The disk will be created if it doesn't exist (didn't happen in qemu)

Update the documentation.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-24 16:05:06 +01:00
Rolf Neugebauer
bd43e35846 Merge pull request #1887 from rneugeba/base
tools: Add VM integration agents to the Alpine base
2017-05-24 10:01:33 +01:00
Rolf Neugebauer
a73be1d7ef tools: Add VM integration agents to the Alpine base
Add the Qemu, Hyper-V and VMware VM tools to the base

Also update the versions file.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-05-24 09:35:37 +01:00
Tycho Andersen
90c7047973 docs: add a blurb about CVE-2017-1000363
As of the time of this patch, the CVE was not available yet in the mitre
db.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-05-23 16:03:00 -06:00
Riyaz Faizullabhoy
dfca3b9775 Remove docker run function as it is unused
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-05-23 13:30:29 -07:00
Rolf Neugebauer
72ad8ac3a3 Merge pull request #1884 from rneugeba/cfg
Add moby config label to common packages
2017-05-23 16:38:20 +01:00