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

2253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
French Ben
8000e7d5ca Removed moby dependency for aws/gcp/azure 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-03-02 14:51:14 -08:00
French Ben
9b23adbcea Rebased cloud clean 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-03-02 13:50:18 -08:00
French Ben
18222c638d Removed extra init packages 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-03-02 13:50:01 -08:00
French Ben
e3d1349d3d Removed extra cloud make 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-03-02 13:50:01 -08:00
French Ben
0276d52340 Removed extra cloud make 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-03-02 13:49:08 -08:00
Justin Cormack
355cbcab7c Merge pull request #1239 from justincormack/tool-add-files 
Add some support to add files in Yaml config
 2017-03-02 12:07:20 -08:00
Justin Cormack
ec643ee8d3 Add some support to add files in Yaml config 
You can specify a file with contents.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-03-01 22:07:45 -08:00
Riyaz Faizullabhoy
c133b04475 Merge pull request #1237 from justincormack/no-experimental-default 
Default to non experimental mode
 2017-03-01 21:55:38 -08:00
Justin Cormack
41ec05c101 Merge pull request #1238 from rneugeba/improv 
Infrakit plugin improvements
 2017-03-01 18:02:25 -08:00
Justin Cormack
e022009cdc Merge pull request #1236 from justincormack/shutdown 
Better shutdown script
 2017-03-01 17:54:35 -08:00
Rolf Neugebauer
1c3f4b4865 infrakit: Make Destroy() usable elsewhere 
Don't return if the process does not exist. Instead proceed and delete
the state directory.

This allows us to use the Destroy() method elsewhere to clean up the state.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2017-03-01 17:41:18 -08:00
Justin Cormack
7177a9f9b7 Default to non experimental mode 
Editions should set experimental in `daemon.json` if they want to
have it set.

See #1076 and https://github.com/docker/pinata/issues/6424

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-03-01 17:35:14 -08:00
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