github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 01:29:07 +00:00
Code Issues Projects Releases Wiki Activity
2,241 Commits 1 Branch 27 Tags 240 MiB
bf41a668d7
Commit Graph

2241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rolf Neugebauer
d1ad02e079 infrakit: Move default VM directory to .infrakit/hyperkit-vms 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-03-01 17:13:17 -08:00
Justin Cormack
367c217283 Better shutdown script 
- make sure we unmount filesystems

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-03-01 17:01:38 -08:00
Rolf Neugebauer
95fa38f879 infrakit: removed vm-lib from arguments 
Instead pass the directory where to find initrd/vmlinuz via the
"Moby" entry in the instance JSON config.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-03-01 16:52:37 -08:00
Rolf Neugebauer
ab15f8c914 Merge pull request #1235 from rneugeba/fix 
scripts: Fix enabling of VPNKit L2 bridge mode
 2017-03-01 16:43:07 -08:00
Rolf Neugebauer
30dae6b278 scripts: Fix enabling of VPNKit L2 bridge mode 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-03-01 16:28:31 -08:00
Rolf Neugebauer
af2ee9e023 infrakit: Use template based instance configuratio 
This change now allows setting the Disk size, memory, and number of CPUs
for an instance via the JSON config file.

We now also write the hyperkit command line to the VM directory.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-03-01 16:09:30 -08:00
Justin Cormack
ce417eab07 Merge pull request #1234 from justincormack/cleanup-tool 
Refactoring of Moby tool
 2017-03-01 16:07:51 -08:00
Justin Cormack
6abcdd0000 Refactoring of Moby tool 
- split out config processing a bit
- just use `capabilities` not `cap-add` and `cap-drop`
- allow use of CAP_ prefix on capabilities, as this is what `runc` uses
- add nginx to example config
- fix bind mounts

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-03-01 15:52:51 -08:00
Justin Cormack
82ee399d0b Merge pull request #1232 from riyazdf/fix-vpnkit-makefile 
Fix old slirp references to vpnkit
 2017-03-01 14:16:18 -08:00
Riyaz Faizullabhoy
4502f3b8a8 Fix old slirp references to vpnkit 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-03-01 13:54:08 -08:00
Justin Cormack
480b5b70b1 Merge pull request #1218 from rneugeba/infrakit 
tools: Add initial HyperKit/Moby InfraKit instance plugin
 2017-02-28 19:03:02 -08:00
Rolf Neugebauer
175daffe71 tools: Add initial HyperKit/Moby InfraKit instance plugin 
This is the first cut of a InfraKit instance plugin which
primarily allows one to manage Moby instances (though, other Linux's
may work too).

It's very rough on the edges and needs work and update to handle
templates and better configuration etc.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-02-28 18:51:31 -08:00
Justin Cormack
bba425d73f Merge pull request #1228 from justincormack/vpnkit 
slirp binary renamed to vpnkit
 2017-02-28 18:35:26 -08:00
Justin Cormack
2e32258221 Merge pull request #1227 from justincormack/randomhostname 
If no hostname is set, use mac address to generate one.
 2017-02-28 18:33:44 -08:00
Justin Cormack
4ffd42e4f0 slirp binary renamed to vpnkit 
Recently com.docker.slirp was renamed.

Please update Docker for Mac before using this script...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-28 17:52:38 -08:00
Justin Cormack
bcff238cf2 If no hostname is set, use mac address to generate one. 
Currently not working very well in hyperkit due to https://github.com/docker/vpnkit/issues/190

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-28 17:42:40 -08:00
Justin Cormack
32e58591b6 Merge pull request #1226 from justincormack/no-hub 
Remove ability to pull docker from hub
 2017-02-28 14:59:49 -08:00
Justin Cormack
a18c3d4c0a Remove ability to pull docker from hub 
We never used this as updates too slow and out of our control.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-28 14:22:30 -08:00
Justin Cormack
edb48c0a13 Merge pull request #1217 from FrenchBen/handle-bundles 
Added support for bundles generated from CI
 2017-02-28 13:37:47 -08:00
Justin Cormack
11b7616e92 Merge pull request #1221 from RobbKistler/make-phony 
Delegated make targets should be phony targets
 2017-02-28 13:35:59 -08:00
Justin Cormack
33a92d7050 Merge pull request #1223 from riyazdf/kernup 
Update kernel to 4.9.13 and 4.4.52
 2017-02-28 13:30:57 -08:00
Justin Cormack
fcc17a631c Merge pull request #1225 from justincormack/docker-17.03 
Upgrade to Docker 17.03.0-ce
 2017-02-28 13:26:16 -08:00
Justin Cormack
54decb3626 Upgrade to Docker 17.03.0-ce 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-28 12:59:52 -08:00
Robb Kistler
2fa112b1b7 Delegated make targets should be phony targets 
Make won't evaluate actual dependencies of targets called with
`$(MAKE) -C` if the target file already exists.  Marking the
top-level targets `.PHONY` will enable incremental builds.

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
 2017-02-28 10:18:50 -08:00
Riyaz Faizullabhoy
d445716406 Merge pull request #1220 from riyazdf/fix-media 
Fix alpine/mobylinux-efi.iso target
 2017-02-28 10:10:48 -08:00
Riyaz Faizullabhoy
e24c8098ff kernel: Update kernel to 4.9.13 and 4.4.52 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-02-28 08:11:07 -08:00
French Ben
66710a38a2 Fixed docker version 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 17:01:58 -08:00
French Ben
8d0197d403 Added bundle detection 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 16:19:29 -08:00
Riyaz Faizullabhoy
945f826c8b Fix alpine/mobylinux-efi.iso target 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-02-27 16:18:37 -08:00
French Ben
a76ddbc51d Removed extra line 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 15:45:15 -08:00
French Ben
efde709ed5 Removed unneeded var 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 14:26:44 -08:00
French Ben
6752ad5511 Flexible docker version 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 14:25:43 -08:00
French Ben
10bd1e526d Added support for bundles generated from CI 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 14:25:43 -08:00
Riyaz Faizullabhoy
52181f7905 Merge pull request #1219 from rneugeba/kernup 
Update kernel to 4.9.12 and 4.4.51
 2017-02-27 14:16:37 -08:00
Justin Cormack
78a11701c9 Merge pull request #1216 from RobbKistler/engine-from-s3 
Allow docker engine to be pulled from s3 bucket
 2017-02-27 14:12:43 -08:00
Rolf Neugebauer
e3502065d9 kernel: Update kernel to 4.4.51 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-02-27 13:55:53 -08:00
Rolf Neugebauer
90895783c0 kernel: Update kernel to 4.9.12 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-02-27 13:49:47 -08:00
Robb Kistler
b2b585ac99 Allow docker engine to be pulled from s3 bucket 
Use aws cli to pull docker engine binaries from s3 bucket.  Conditional and
happens if DOCKER_BIN_URL begins with 's3://'

Example usage:
```
  export AWS_ACCESS_KEY_ID=key
  export AWS_SECRET_ACCESS_KEY=secret
  make DOCKER_BIN_URL=s3://path-to-engine-binaries
```
Signed-off-by: Robb Kistler <robb.kistler@docker.com>

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
 2017-02-23 20:32:00 -08:00
Riyaz Faizullabhoy
51642e8abb Merge pull request #1215 from FrenchBen/fix-url 
Added quotes for curling
 2017-02-23 15:34:42 -08:00
Justin Cormack
01ef722f8b Merge pull request #1214 from rneugeba/multi 
scripts: Add script to run a hyperkit with moby on the DfM network
 2017-02-23 15:17:52 -08:00
French Ben
a118ce4f05 Added quotes for curling 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-23 15:15:28 -08:00
Rolf Neugebauer
2a7972e0b3 scripts: Add script to run a hyperkit with moby on the DfM network 
This requires a VPNKit which includes https://github.com/docker/vpnkit/pull/188

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-02-23 11:26:49 -08:00
Justin Cormack
6aa1da8baf Merge pull request #1211 from justincormack/make-tag 
Add a CI tag Makefile target
 2017-02-21 11:00:51 +00:00
Justin Cormack
7fdb89d22f Add a CI tag Makefile target 
The CI will set `CI_TAG` to the tag name, which will be used for the
uploaded images instead of the git commit ID.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-21 10:36:25 +00:00
Justin Cormack
ddafc8c871 Merge pull request #1208 from justincormack/mobytool 
Rough first version of the moby tool
 2017-02-21 10:22:04 +00:00
Justin Cormack
4797088ec0 Rough first version of the moby tool 
- terrible code
- lots needs changing
- can build a Moby from a config yaml that boots

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-20 21:44:23 +00:00
Justin Cormack
a5cbe08155 Merge pull request #1207 from justincormack/kernel-image-for-mobytool 
Change kernel upload for new tooling
 2017-02-20 21:41:52 +00:00
Justin Cormack
f4a112dc21 Change kernel upload for new tooling 
The mobylinux/kernel image now has the bzImage (no longer named vmlinuz64)
and a tarball of the files needed for the initrd, ie modules etc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-20 15:54:02 +00:00
Justin Cormack
372a463976 Merge pull request #1206 from justincormack/kernelup 
Kernel 4.9.11, 4.4.50 and AUFS update
 2017-02-20 13:54:25 +00:00
Justin Cormack
5af24d0d8f Kernel 4.9.11, 4.4.50 and AUFS update 
Security update, importance low.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-20 12:15:39 +00:00