Rolf Neugebauer
309ae23c2e
cmd: Use github.com/rn/iso9660wrap for metadata
...
The repository was moved...
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com >
2017-06-11 09:11:06 +01:00
Rolf Neugebauer
72f68d8340
vendor: Add go-winio and rename github.com/rneugeba to github.com/rn
...
While at it, also re-order vendor.conf to be (more) alphabetical.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com >
2017-06-11 09:11:06 +01:00
Rolf Neugebauer
ce8de92978
cmd: Fix disk "size" handling
...
commit bdf9b1f31a
introduced a bug with disk size handling
where GB was not handled correctly. Fix it.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com >
2017-06-11 09:11:06 +01:00
Rolf Neugebauer
b3bb4d02e6
Merge pull request #2016 from justincormack/getty-linuxkit
...
Migrate base linuxkit.yml to getty, and tests to new init
2017-06-10 20:47:01 +01:00
Justin Cormack
53279e030a
Migrate base linuxkit.yml to getty, and tests to new init
...
Missed in #2004
Not updated projects.
Signed-off-by: Justin Cormack <justin@specialbusservice.com >
2017-06-10 18:40:33 +01:00
Rolf Neugebauer
a60de348ab
Merge pull request #2014 from kencochrane/more_aws_meta
...
Enhanced the AWS provider in the metadata package, to include more data.
2017-06-10 16:42:34 +01:00
Ken Cochrane
7dafc3be01
Added more AWS metadata to /var/config
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
2017-06-10 10:54:43 -04:00
Justin Cormack
a4d36e5f63
Merge pull request #2013 from yomimono/use-newer-dhcp-client
...
MirageSDK: Use newer dhcp client
2017-06-09 20:49:40 +01:00
Mindy Preston
1ab32f9ca7
use dhcp_client_lwt instead of dhcp_client_mirage
...
Use the `with-cdhcpc` branch of charrua-client, which exposes `Dhcp_client_lwt`. Dhcp_client_lwt exposes similar functions to `Dhcp_client_mirage`, but does not impose the structure of a Mirage_types_lwt.ipv4_config on the returned object, rather returning the full lease; the engine can then expose whatever information from the lease it finds to be pertinent.
Signed-off-by: Mindy Preston <mindy.preston@docker.com >
2017-06-09 13:57:07 -05:00
Mindy Preston
bcb0c52fff
nudge some build updates around
...
build from (now-released) canpnproto 0.6.0; use the latest jbuilder beta.
Signed-off-by: Mindy Preston <mindy.preston@docker.com >
2017-06-09 13:38:55 -05:00
Riyaz Faizullabhoy
9d8eba91eb
Merge pull request #2012 from justincormack/homebrew-docs
...
Add homebrew instructions
2017-06-09 09:20:48 -07:00
Justin Cormack
a74e8657db
Add homebrew instructions
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-06-09 16:36:31 +01:00
Justin Cormack
dcd6cb09a9
Merge pull request #2011 from justincormack/make-no-docker
...
Add a "local" make target that does not use Docker
2017-06-09 16:07:32 +01:00
Justin Cormack
ac90b50437
Add a "local" make target that does not use Docker
...
This assumes you are in the right directory, have Go set up etc.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-06-09 15:24:21 +01:00
Rolf Neugebauer
0b2506523d
Merge pull request #2010 from rn/maintain
...
Update MAINTAINERS
2017-06-09 13:48:36 +01:00
Rolf Neugebauer
2674c999b1
Merge pull request #2009 from rn/disksize
...
cmd: Default disk "size" parameter to GB
2017-06-09 13:43:28 +01:00
Rolf Neugebauer
91b9dde12e
Update MAINTAINERS
...
Both @ijc25 and @rneugeba changed their GH username
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com >
2017-06-09 13:00:50 +01:00
Rolf Neugebauer
bdf9b1f31a
cmd: Default disk "size" parameter to GB
...
Most cloud providers allow disk size allocation on in units
of GB. Make it the default for linuxkit disk "size" arguments.
Users can override the unit by appending a M to the disk size.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com >
2017-06-09 11:51:48 +01:00
Justin Cormack
6b4bae6832
Merge pull request #77 from justincormack/tar-abs
...
Remove absolute paths from files
2017-06-09 11:49:26 +01:00
Justin Cormack
796d943054
Remove absolute paths from files
...
tarballs should only have relative paths in.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-06-09 11:39:52 +01:00
Riyaz Faizullabhoy
84090f6b4b
Merge pull request #2007 from riyazdf/tool-disk-syntax-change
...
Tool disk syntax change
2017-06-08 20:53:12 -07:00
Riyaz Faizullabhoy
8726adaa78
s/moby/linuxkit for run
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2017-06-08 17:10:14 -07:00
Riyaz Faizullabhoy
9c8e82734d
fix disk size arg
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2017-06-08 17:09:52 -07:00
Riyaz Faizullabhoy
464d77c5ae
Merge pull request #2004 from deitch/update-init-getty-examples
...
Update linuxkit/init to gettyless; add getty to relevant examples
2017-06-08 11:28:43 -07:00
Avi Deitcher
ee2766de78
Update linuxkit/init to gettyless; add getty to relevant examples
...
Signed-off-by: Avi Deitcher <avi@deitcher.net >
2017-06-08 19:56:34 +03:00
Justin Cormack
854a53130f
Merge pull request #2005 from deitch/fix-init-issue
...
Fix perms on /etc/init.d/000-issue
2017-06-08 17:39:32 +01:00
Riyaz Faizullabhoy
9155dff870
Merge pull request #2002 from justincormack/docs-to-tool
...
Move yaml docs to moby/tool
2017-06-08 09:21:36 -07:00
Avi Deitcher
f2cece3c61
Fix perms on /etc/init.d/000-issue
...
Signed-off-by: Avi Deitcher <avi@deitcher.net >
2017-06-08 18:49:29 +03:00
Justin Cormack
050fa905f1
Move yaml docs to moby/tool
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-06-08 15:54:40 +01:00
Justin Cormack
e7fc277fd2
Merge pull request #76 from justincormack/docs
...
Add docs
2017-06-08 15:53:54 +01:00
Justin Cormack
eea5c6f126
Updates to the docs
...
Some of this was out of date or missing.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-06-08 15:45:49 +01:00
Justin Cormack
e0dc6302a8
Merge pull request #1978 from deitch/gettyless-init
...
Remove all getty from init
2017-06-08 15:33:21 +01:00
Justin Cormack
0eb4a49b24
Import yaml documentation from LinuxKit
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-06-08 14:58:29 +01:00
Justin Cormack
1f56da3288
Merge pull request #2001 from thaJeztah/update-mailmap
...
Update .mailmap to make auto-generating work
2017-06-08 14:55:29 +01:00
Justin Cormack
35ee128bfd
Merge pull request #75 from justincormack/perm
...
Allow setting of mode in files section
2017-06-08 14:54:39 +01:00
Rolf Neugebauer
6d1b511f86
Merge pull request #2000 from rneugeba/build
...
build: Make sure the tools compile on Linux/macOS/Windows
2017-06-08 14:46:15 +01:00
Justin Cormack
83c166d3f2
Allow setting of mode in files section
...
Also keep track of directory creation there, so you can explicitly
set directory permissions if required, and to avoid duplicates.
We should really keep track of files created elsewhere in the build
as well as we still might create some extras, but at least you can
set the write permisisons.
We can add uid, gid support too if required...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-06-08 14:44:02 +01:00
Rolf Neugebauer
3e5797a911
build: Make sure the tools compile on Linux/macOS/Windows
...
This patch adds cross compilation steps for Linux, macOS and,
Windows to the CI targets to ensure that the all commands cross
compile nicely.
Although the CI runs on Linux we still explicitly compile for
Linux in case developers use the CI targets locally on a
non-Linux host.
While at it, also fix the GOARCH override to enable cross compilation
of ARM64 on Linux. The build support seems to work, but the
compilation fails (hence it is not added to the test).
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com >
2017-06-08 13:57:42 +01:00
Sebastiaan van Stijn
b9af64e506
Update .mailmap to make auto-generating work
...
When mapping e-mail addresses and names;
<preferred@example.com > <foo@bar.com >
Maps `foo@bar.com ` to `preferred@example.com `, whereas:
Preferred Name <preferred@example.com > <foo@bar.com >
Will update the e-mail address _and_ set the preferred name, _if_ the original
e-mail address in the commit was `<foo@bar.com >` (otherwise the rule is not
executed).
Finally, this rule:
Preferred Name <preferred@example.com >
Will set the name to `Preferred Name` if the e-mail address in the commit
matches `preferred@example.com `
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-06-08 14:56:10 +02:00
Justin Cormack
8a18954b75
Merge pull request #1999 from justincormack/authorsup
...
Update AUTHORS
2017-06-08 13:26:08 +01:00
Justin Cormack
2ab1022d6b
Update AUTHORS
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-06-08 12:37:16 +01:00
Justin Cormack
68cf80d4aa
Merge pull request #1998 from justincormack/enable-c-t-all-tests
...
Re-enable content trust on build test
2017-06-08 12:14:13 +01:00
Justin Cormack
907ebfe8d8
Merge pull request #1997 from justincormack/getty-cleanup
...
Getty cleanup
2017-06-08 11:46:22 +01:00
Justin Cormack
6066fb761f
Merge pull request #1996 from rneugeba/example
...
example: Remove docker.json from linuxkit.yml
2017-06-08 11:42:00 +01:00
Justin Cormack
985ddbd4d8
Re-enable content trust on build test
...
I disabled this for speed when content trust cache was not working
See also #1995
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-06-08 11:19:20 +01:00
Justin Cormack
9d4aed42f1
Update examples/getty with new hash since Makefile changed
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-06-08 11:05:22 +01:00
Justin Cormack
513f661458
Clean up getty Makefile to match others
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-06-08 11:02:48 +01:00
Rolf Neugebauer
3c0ebbb662
example: Remove docker.json from linuxkit.yml
...
The 'docker.json' file is not used in the top level
example and was merely there as an example use of the
'file' section. Since we now have the containerd config
file in the 'file' section the 'docker.json' entry is
no longer needed.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com >
2017-06-08 10:59:23 +01:00
Riyaz Faizullabhoy
b5ae1260ab
Merge pull request #1982 from rneugeba/hyperkit
...
Convert some tests to run on hyperkit when run on OSX
2017-06-07 17:54:35 -07:00
Riyaz Faizullabhoy
33d66d380e
Merge pull request #1994 from tych0/fix-pkg-builds
...
fix package builds in some cases
2017-06-07 17:49:32 -07:00