Commit Graph

1923 Commits

Author SHA1 Message Date
c6c5a0aaa0 Remove Windows CI stubs from hack/
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d945441e23e8c7a5ccd541062da8e206264127fb
Component: engine
2016-11-05 21:01:06 -07:00
854000b31e Merge pull request #28074 from dmcgowan/force-sha512-sign-repos
Use sha512 when gpg signing builds
Upstream-commit: 3a9322e9ec9ed64b1e165fb901fde0f8021471d3
Component: engine
2016-11-04 14:08:52 -07:00
ac2b6ee292 Merge pull request #27737 from justincormack/no-ambient-1.13
Revert ambient capabilities for 1.13
Upstream-commit: cac13fc131c4e539a412ef46d3828dc79453c524
Component: engine
2016-11-04 12:52:21 -07:00
b865964d4d Use runc version built without ambient capabilities
Until we can support existing behaviour with `sudo` disable
ambient capabilities in runc build.

Add tests that non root user cannot use default capabilities,
and that capabilities are working as expected.

Test for #27590

Update runc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: c5251f7116e3d9095a7169fc31bd170dff997c2e
Component: engine
2016-11-04 17:25:28 +00:00
b6c8ff694d Use sha512 when gpg signing builds
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 201f8043102efbbb624b3d70001878328cbbf655
Component: engine
2016-11-04 09:45:13 -07:00
c5466cbef3 Run lint on most of api/types
The validate-lint script excludes any package names that match
api/types. However, the only subpackage that appears to cause issues is
api/types/container (due to stuttering names). Tighten the filtering so
that other code inside api/types is validated.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: efa7068133f224386dbcceb19a6dd31d1d2e9404
Component: engine
2016-11-03 19:08:24 -07:00
61646d77af project: use vndr for vendoring
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f2614f2107c838d014d31b806e3b8a9f1395cb2b
Component: engine
2016-11-03 15:31:46 -07:00
45ef7232e4 Merge pull request #27964 from dnephin/faster-validate
Faster validation scripts
Upstream-commit: f54339dfead48712857d38b6a4ff7f45717a7074
Component: engine
2016-11-03 15:17:34 -07:00
d522560d52 Merge pull request #28019 from sanimej/vendor
Vendoring libnetwork @9ab6e13
Upstream-commit: 2d676d38a0d69ee2f4b126e8fcd48c830ee3796b
Component: engine
2016-11-03 14:35:28 -07:00
1747fa824e Add stubs for windows CI
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9a2eb8b162e4df0533aeafc2e8d7bb9bbadb8234
Component: engine
2016-11-03 14:24:58 -06:00
dd0403a2eb Move validation out of hack/make
Allow each script to run directly without the hack/make.sh wrapper. These
scripts do not produce artifacts and do not benefit from the "bundles"
framework.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 22033e10034884734621f185b60ddaa119014480
Component: engine
2016-11-03 14:24:22 -06:00
2a3ba6c702 Vendoring libnetwork @9ab6e13
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 8479a765dd5b4b56acd0815135d201bc98b3709a
Component: engine
2016-11-03 10:58:47 -07:00
ec058523ee Vendor davecgh/gospew @ 6d212880
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3b6cd20b0b123a48cb3a484f194b9ec83d1d0568
Component: engine
2016-11-03 09:35:58 -07:00
63c8414c8b Don't include PowerShell completions in tgz
The PowerShell completion script was outdated,
and removed from this repository in
65fdbf0210e8faa1598515a7fd7ef4ed33d68d43.

A more up to date implementation can be found
here; https://github.com/samneirinck/posh-docker

Removing this script from the tgz

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1be4b0e0ccbce268e308ff5955549b404751e0a9
Component: engine
2016-11-02 21:51:58 -07:00
5ca818f32c Merge pull request #27990 from crosbymichael/grimes-11-2
Update init to fe069a03affd2547fdb05e5b8b07202d2e4
Upstream-commit: 42ef2bd4fea4d79eb584620d35f8646caa52ecdd
Component: engine
2016-11-02 14:27:31 -07:00
018c388beb Merge pull request #27918 from dmcgowan/use-system-certs
Merge system certificate pool with custom certificates
Upstream-commit: 1e51f99684be5aa4af52719f95e5870489c8658f
Component: engine
2016-11-02 13:51:58 -07:00
e717ff6f92 Update swarmkit to 4dfc88ccce14ced6f0a6ea82d46dca004c6de0e2
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cff3cdd35a85e01f18851ecf86b2ae4b6a867cc7
Component: engine
2016-11-02 19:43:27 +01:00
41532969c9 Merge pull request #27835 from tophj-ibm/update-install-script-for-p-and-z
Fix install script for multiarch
Upstream-commit: b06f25496d803efa2177cd7e89d660f37b295a19
Component: engine
2016-11-02 17:14:24 +00:00
c05bbc9c5f Update init to fe069a03affd2547fdb05e5b8b07202d2e4
diff:

```patch
diff --git a/Makefile b/Makefile
index 0b2b063..70df01b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+GIT_VERSION := $(shell git describe --abbrev=40 --long --dirty --always --tags)

 all:
-	gcc -O2 -o init -static grimes.c
+	gcc -O2 -DVERSION=\"$(GIT_VERSION)\" -o init -static grimes.c
diff --git a/grimes.c b/grimes.c
index d0f836b..ffeea98 100644
--- a/grimes.c
+++ b/grimes.c
@@ -29,7 +29,7 @@ typedef struct reaper_t {
 } reaper_t;

 // reaper_new initializes the reaper with the provided process.
-// it also sets up the signal handlers and child handlers for restore
+// it also sets up the signal handlers and child handlers for restore
 // when the child is execed
 int reaper_new(reaper_t * reaper, process_t * process)
 {
@@ -57,7 +57,7 @@ int reaper_new(reaper_t * reaper, process_t * process)
 	return 0;
 }

-// reaper_exit closes the reaper's signalfd and exits with the
+// reaper_exit closes the reaper's signalfd and exits with the
 // child's exit status
 void reaper_exit(reaper_t * reaper, int status)
 {
@@ -68,11 +68,11 @@ void reaper_exit(reaper_t * reaper, int status)
 	exit(WEXITSTATUS(status));
 }

-// reaper_reap reaps any dead processes.  If the process that is reaped
+// reaper_reap reaps any dead processes.  If the process that is reaped
 // is the child process that we spawned get its exit status and exit this program
 int reaper_reap(reaper_t * reaper)
 {
-	int status, child_exited, child_status = 0;
+	int status = 0, child_exited = 0, child_status = 0;
 	for (;;) {
 		pid_t pid = waitpid(-1, &status, WNOHANG);
 		switch (pid) {
@@ -140,6 +140,12 @@ int main(int argc, char **argv)
 {
 	process_t process;
 	reaper_t reaper;
+
+	if (argc == 2 && !strcmp(argv[1], "--version")) {
+		printf("grimes version %s\n", VERSION);
+		exit(0);
+	}
+
 	if (reaper_new(&reaper, &process) != 0) {
 		bail("initialize reaper %s", strerror(errno));
 	}

```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 131514dad67be6c8dce6098c219597839aa995d6
Component: engine
2016-11-02 09:27:54 -07:00
e996eee531 Update go connections vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: fd82240e0a6d83b08a6749f1cf212558deee1acb
Component: engine
2016-10-31 13:38:40 -07:00
39c0d0f084 Merge pull request #27648 from dnephin/swagger-gen-operations
Generated more api types from swagger spec
Upstream-commit: 2fc760496b24cc1d42d5527ec593b0e1b1701d54
Component: engine
2016-10-31 15:33:16 -04:00
68afbb36f4 Updating aws-sdk-go to version 1.4.22
Signed-off-by: Laura Frank <ljfrank@gmail.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ba4e0c328f96e6a6caa6c67e3ee4d446d75a584f
Component: engine
2016-10-31 09:23:45 -07:00
2c5782817e Generate ContainerWait response from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 181562c2e54225d6ce737d98b03d3157451a5dbc
Component: engine
2016-10-31 11:19:53 -04:00
bc7bcb9601 generate AuthResponse type from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2732b8a9bb3edb92121d0b0dcc144e5f557e2fbf
Component: engine
2016-10-31 11:16:03 -04:00
1b85879c03 Generate container update response from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f196cf6a090556ccb42198043a71d133482b510d
Component: engine
2016-10-31 11:16:02 -04:00
01541139a5 Add an IDResponse type
Generated from a swagger spec and use it for container exec response

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 01883c136d9ef06962d80aa81e27d1d90eb6d199
Component: engine
2016-10-31 11:16:02 -04:00
913e9a48c1 Generate container create response from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bad849fc826b410c3aeb753a8c7f6b38f7ae12b0
Component: engine
2016-10-31 11:16:02 -04:00
dc10e9a664 Use a config to generate swagger api types
Moves the resposne types to a package under api/types

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 29df3bdb117a058ae040686dd0f2565ae9ad743a
Component: engine
2016-10-31 11:13:41 -04:00
d19255532a Generate VolumesCreateRequest from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5c2498fd3c41f4badb1788665886d30772537f73
Component: engine
2016-10-31 11:13:41 -04:00
fa3a1f0666 Generate ErrorResponse struct from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bc757385455dee272ca563031afece05c935320b
Component: engine
2016-10-31 11:13:41 -04:00
31c5c30bb3 Generate VolumeList response from the swagger spec
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d459e83b1c993d63d5f94b85a7f8ddf3ac01beae
Component: engine
2016-10-31 11:13:41 -04:00
6d5a2dc4f9 Fix install script for multiarch
The current check for uname -m just looks for *64 which hits a lot
more cases than it should (mips for ex), and ignores a few that it shouldn't.

This check will run the install script if on a supported architecture
(x86_64 or amd64) or an unofficial one with a docker repository
(armv6l or armv7l) and will give a more accurate error on an unofficial
64-bit architecture that isn't in the docker repository.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 28bdf08e0a13c34d765b5db90b552ed6fc3fd459
Component: engine
2016-10-31 09:38:26 -04:00
34bac6f06e Fix bunch of typos
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: e6866492c4492db3bb9546afa2fbaed20f4c1883
Component: engine
2016-10-29 15:03:26 +08:00
ed6994ddbe Merge pull request #27844 from LK4D4/fix_build_rpm
project: fix build rpm
Upstream-commit: cff976a0b8a52ff2baee3f3cc503276862278153
Component: engine
2016-10-28 16:50:58 -07:00
30520bd0c0 project: fix build rpm
* change workdir for accessing install-binaries.sh
* use other gopath for binaries to preserve sources
* add sources of proxy and grimes to rpc spec
* use dynamic proxy with -linkmode external in deb and rpm

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bf0fe87fe6acb0ad55539fdfa565dcdca8e343a5
Component: engine
2016-10-28 14:34:17 -07:00
86df94b9ba Merge pull request #27369 from cezarsa/hc
Add --health-* flags to service create and update
Upstream-commit: f860289131e36ad2dde5ebe60d15a86fd97934b5
Component: engine
2016-10-28 21:59:52 +02:00
500367df6e Merge pull request #27860 from vdemeester/update-go-connections-vendor
Update go-connections vendoring
Upstream-commit: f391f9c3b9e3db1149e6bc13ee2117cb69e6a617
Component: engine
2016-10-28 12:01:59 -07:00
28336d95ca Merge pull request #26659 from yongtang/26341-fixed-cidr-multiple-addresses-bridge
Fix issue for `--fixed-cidr` when bridge has multiple addresses
Upstream-commit: 1e989abefba1a424b95d3fc1474e489ace747598
Component: engine
2016-10-28 11:05:01 -07:00
1fa0d4beb8 Update go-connections vendoring
This makes possible to use IPv6 addresses in the `--publish` flag of
docker (`run`, …)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 609c183ae7092c60b61021e61f181ae67dea331a
Component: engine
2016-10-28 09:35:30 -07:00
4432c92e1d vendor: update swarmkit
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
Upstream-commit: fd657a10d093d5dc838a07098054d0b855718f3b
Component: engine
2016-10-28 00:37:39 -02:00
52c41330fb Merge pull request #27774 from runcom/vendor-distr
vendor docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc
Upstream-commit: 4e6cb66ecc401bb748bb0db69b1925ca22867d6a
Component: engine
2016-10-27 17:07:03 -07:00
fede704b07 Merge pull request #25820 from crosbymichael/prom
Add metrics output to docker
Upstream-commit: 33474a11fea50d50c1d365b29b94b978b2b6fff7
Component: engine
2016-10-27 16:44:26 -07:00
2a9003b823 Add basic prometheus support
This adds a metrics packages that creates additional metrics.  Add the
metrics endpoint to the docker api server under `/metrics`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Add metrics to daemon package

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

api: use standard way for metrics route

Also add "type" query parameter

Signed-off-by: Alexander Morozov <lk4d4@docker.com>

Convert timers to ms

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 3343d234f3b131d4be1d4ca84385e184633a79bd
Component: engine
2016-10-27 10:34:38 -07:00
1826752c1b Vendor libnetwork to f4338b6f1085ccfe5972e655cca8a1d15d73439d
This fix updates libnetwork to f4338b6f1085ccfe5972e655cca8a1d15d73439d.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: fc62ad6b95a19d704bd64bcbe70f355ac2230026
Component: engine
2016-10-27 09:13:25 -07:00
d68cad7965 Update hcsshim to v0.5.2
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: f9adce18c731188e30dc0c8b00764bebcb9befd4
Component: engine
2016-10-26 15:39:35 -07:00
907d8fbad9 Revendor swarmkit to 0ec7c6ee4b3185ec4e3d6bd65f8f5542b1761421
This fix revendor swarmkit to 0ec7c6ee4b3185ec4e3d6bd65f8f5542b1761421.

Related docker PR and issues:
(#27567)
(#25437)
(#26988)
(#25644)

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: bb568f80975ac8a92802ef39f71302b26aaf3100
Component: engine
2016-10-26 06:49:39 -07:00
2c601824ac vendor docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 78a429a97ac110e986c150a57507163dfe223f46
Component: engine
2016-10-26 10:55:50 +02:00
8c5b951858 Merge pull request #27748 from amitkris/uprev_certificate_transparency
Uprev google/certificate-transparency to include Solaris support
Upstream-commit: 77f4c30a21ae029bc953d5f106ed8d955d21e244
Component: engine
2016-10-25 16:21:06 -07:00
62c252366f Merge pull request #27735 from justincormack/completions-tgz
Add shell completions to tgz
Upstream-commit: 280eadf9bfbe328d6f18aa46d5ba4bad1f3f1d2a
Component: engine
2016-10-25 15:46:45 -07:00
c457ba5205 Uprev google/certificate-transparency to include Solaris support
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Upstream-commit: 16db092af2b5a58c41898f275638203470612be9
Component: engine
2016-10-25 13:14:57 -07:00