github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-21 08:14:30 +00:00
Code Issues Projects Releases Wiki Activity
6,752 Commits 1 Branch 27 Tags 240 MiB
62c46e10f2
Commit Graph

6752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tycho Andersen
06d7157e3c ima-namespace: only build utils if it doesn't exist 
Signed-off-by: Tycho Andersen <tycho@docker.com>
 2017-05-26 14:31:38 -06:00
Tycho Andersen
4a69a57557 ima namespace project: account for new -output in moby tool 
The moby tool requires us to specify outputs on invocation. Let's do that.

Signed-off-by: Tycho Andersen <tycho@docker.com>
 2017-05-26 14:27:59 -06:00
Justin Cormack
3030e27c91 Merge pull request #1910 from tych0/rebuild-moby 
rebuild bin/moby as necessary
 2017-05-26 17:22:06 +01:00
Justin Cormack
6388405835 Merge pull request #1911 from justincormack/less-verbose 
Only output qemu disk creation info in debug mode
 2017-05-26 17:21:53 +01:00
Tycho Andersen
332d3ef71b rebuild bin/{moby,rtf} as necessary 
Closes #1880

Signed-off-by: Tycho Andersen <tycho@docker.com>
 2017-05-26 09:57:27 -06:00
Rolf Neugebauer
a960d79bbc Merge pull request #1909 from rneugeba/base-config 
Update Alpine base, add config labels, and trust
 2017-05-26 16:51:24 +01:00
Justin Cormack
4e32ad7817 Only output qemu disk creation info in debug mode 
As I am using this command in the internals of `moby` the
verboseness is annoying.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-26 16:43:49 +01:00
Rolf Neugebauer
37c5e6bffb pkg: Update open-vm-tools to new Alpine base 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 16:23:56 +01:00
Rolf Neugebauer
86a6635930 docs: Update documentation 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 16:23:56 +01:00
Rolf Neugebauer
9bdfcb5b12 Update YAML files with new packages, config, and trust data 
- Update to packages using the Alpine 3.6 base image
- Remove config for packages which now supply it
- Update/add trust section

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 16:23:55 +01:00
Rolf Neugebauer
157c07be15 pkg: Add config label to the swap package 
Note this also removes 'net:host' and 'pid:host' as
this does not seem to be necessary.

Also update to latest Alpine base image.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 16:21:12 +01:00
Rolf Neugebauer
fbbfd7a1fe pkg: Add config label to the sshd package 
Also update to latest Alpine base image.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 16:21:12 +01:00
Rolf Neugebauer
27c573ed2c pkg: Add config label to the node_exporter package 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 15:50:54 +01:00
Rolf Neugebauer
330ccdf0e2 pkg: Add config label to the openntpd package 
Also update to latest Alpine base image.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 15:50:54 +01:00
Rolf Neugebauer
3aac2416ad pkg: Add config label to the mount package 
Also update to latest Alpine base image.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 15:50:54 +01:00
Rolf Neugebauer
5484035af5 pkg: Add config label to the format package 
Also update to latest Alpine base image.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 15:50:54 +01:00
Rolf Neugebauer
7915cae6bd pkg: Update the Alpine base for some of the packages 
The remaining packages will be updated with subsequent commits
to also include the config label.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 15:50:54 +01:00
Rolf Neugebauer
ac5122ced7 tools: Add Dockerfile to the Alpine base image to calculate the hash 
The Dockerfile is now an input to the contents of the base image and
needs to be included in the hash calculation.

Also, make the Makefile, Dockerfile and pacakges file a dependency.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 15:50:54 +01:00
Rolf Neugebauer
aecad407c5 tools: Add shellcheck to the Alpine base 
We use the "official" Alpine based Docker image and extract
the binary and libraries from it and add to the base. Compiling
it from source would require a Haskell setup...

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 15:50:54 +01:00
Rolf Neugebauer
977a2eb0ff tools: Switch the Alpine base image to Alpine 3.6 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-05-26 15:50:54 +01:00
Justin Cormack
a1d96f23a9 Merge pull request #1898 from thebsdbox/open-vm-tools 
open-vm-tools package
 2017-05-26 15:32:01 +01:00
Justin Cormack
e8dc61e910 Merge pull request #48 from justincormack/dir-fixes 
Fix build in directory
 2017-05-26 15:28:18 +01:00
Justin Cormack
b8cdb985fd Fix build in directory 
Remove unnecessary argument to buildInternal function, does not need to know the name.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-26 15:22:12 +01:00
Justin Cormack
2cd3a5b141 Merge pull request #47 from justincormack/dir 
Add a -dir option for location of output files
 2017-05-26 15:02:29 +01:00
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