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

2416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
French Ben
b62fd55ec1 Rebased cloud clean 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-03-02 13:50:18 -08:00
French Ben
8a7d68b7c1 Removed extra init packages 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-03-02 13:50:01 -08:00
French Ben
c04ab4caa9 Removed extra cloud make 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-03-02 13:50:01 -08:00
French Ben
c6fda46735 Removed extra cloud make 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-03-02 13:49:08 -08:00
Justin Cormack
bea9f054ae 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
21e41fcf8c 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
a64178baf3 Merge pull request #1237 from justincormack/no-experimental-default 
Default to non experimental mode
 2017-03-01 21:55:38 -08:00
Justin Cormack
cc33722bd9 Merge pull request #1238 from rneugeba/improv 
Infrakit plugin improvements
 2017-03-01 18:02:25 -08:00
Justin Cormack
7c4d92349e Merge pull request #1236 from justincormack/shutdown 
Better shutdown script
 2017-03-01 17:54:35 -08:00
Rolf Neugebauer
64c0c441ec 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
a4810aeab6 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
0c1d9fd624 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
33471d4070 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
3aa4bedab8 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
9e00b1820d 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
91c2710038 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
1d5cc2f59b 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
371cd1abf6 Merge pull request #1234 from justincormack/cleanup-tool 
Refactoring of Moby tool
 2017-03-01 16:07:51 -08:00
Justin Cormack
e6952e3094 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
77f0f79dea 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
4fa5273fe9 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
1d19461f7d 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
2bcaea5322 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
047bca8d18 Merge pull request #1228 from justincormack/vpnkit 
slirp binary renamed to vpnkit
 2017-02-28 18:35:26 -08:00
Justin Cormack
ecec9d45fb 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
169f3e670b 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
194798cbf5 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
a397c8e1e4 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
eed645d7e0 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
4cbb9f27d6 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
41eb97c78e 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
780d4c9c20 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
2d4aafafca 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
61291f0685 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
cfcb540eb8 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
a545ced31c Merge pull request #1220 from riyazdf/fix-media 
Fix alpine/mobylinux-efi.iso target
 2017-02-28 10:10:48 -08:00
Riyaz Faizullabhoy
cc1dcb3b36 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
b15b5326b4 Fixed docker version 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 17:01:58 -08:00
French Ben
a9849e776a Added bundle detection 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 16:19:29 -08:00
Riyaz Faizullabhoy
6e7c0edb55 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
924c0da2d2 Removed extra line 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 15:45:15 -08:00
French Ben
0263896388 Removed unneeded var 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 14:26:44 -08:00
French Ben
57c609f700 Flexible docker version 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 14:25:43 -08:00
French Ben
269e2c8157 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
940708de8d 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
3032f6e211 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
c93c7cf433 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
5e9890adbc 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
e0269e0978 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
739a7b0638 Merge pull request #1215 from FrenchBen/fix-url 
Added quotes for curling
 2017-02-23 15:34:42 -08:00