Commit graph

2053 commits

Author SHA1 Message Date
Vincent Demeester
917cb0d9d0 Merge pull request #31683 from AkihiroSuda/it-on-swarm-easy-analysis
integration-cli-on-swarm: new CLI flag: -keep-executor
2017-03-28 15:50:52 +02:00
Tibor Vass
b5bd023de6 Merge pull request #30514 from FrenchBen/yaml
Yaml Generation
2017-03-15 16:20:33 -07:00
Kenfe-Mickael Laventure
440b2cc7ab Update containerd to version 422e31ce907fd9c3833a38d7b8fdd023e5a76e73
This fixes an issue preventing containerd from starting if the state
directory didn't exist already.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-15 08:08:39 -07:00
French Ben
5443f0152f docs: added support for CLI yaml file generation
Signed-off-by: French Ben <frenchben@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-03-14 16:04:08 -07:00
Victor Vieux
f72404e48d Merge pull request #31686 from AkihiroSuda/fix-defer-it-on-swarm
integration-cli-on-swarm: make sure deferred function gets executed before os.Exit()
2017-03-14 14:41:41 -07:00
Kenfe-Mickael Laventure
4c95db877c Update containerd to version 949e6facb77383876aeff8a6944dde66b3089574
This fixes a regression where debug logs where hidden in debug mode.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-13 11:44:40 -07:00
Kenfe-Mickael Laventure
6cea6d40fc Update runc to 9c2d8d184e5da67c95d601382adf14862e4f2228
This fix a conflict with systemd daemon-reload (see
https://github.com/opencontainers/runc/pull/1344)

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-10 14:07:56 -08:00
Kenfe-Mickael Laventure
07ad8c6640 Update containerd to 9f68f96b8c0746e254b52bc1defcf7cc0c1a62eb
This include ensure that containerd GRPC healthcheck service is
register before the restore process is done as this can take a while.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-10 09:16:12 -08:00
Akihiro Suda
59ba54094e integration-cli-on-swarm: make sure deferred function gets executed before os.Exit()
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-09 08:54:11 +00:00
Akihiro Suda
b9aa04cf9a integration-cli-on-swarm: new CLI flag: -keep-executor
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-09 08:13:13 +00:00
Kenfe-Mickael Laventure
49131f3ad4 Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-08 14:56:29 -08:00
Daniel Nephin
18e0a327ca Add compose-bindata validation to default.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-08 10:23:40 -05:00
Akihiro Suda
5a1b06d7fd rerun vndr
* run latest vndr so as to collect more LICENSE files
 * remove unused packages
 * vendor github.com/philhofer/fwd with LICENSE.md (MIT)
 * vendor github.com/bsphere/le_go with LICENSE (MIT)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-08 02:29:34 +00:00
Victor Vieux
98b7c4b00a
add -ce support
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 44aec1b692)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-06 16:33:20 +01:00
Vincent Demeester
b985db92a3
Fix inContainer detection which CROSSPLATFORM env variable missing
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-03-02 14:36:37 +01:00
Sebastiaan van Stijn
01ed606439 Merge pull request #29775 from AkihiroSuda/integration-cli-on-swarm
[EXPERIMENTAL] Integration Test on Swarm (completes in about 5 minutes, with 10 Swarm nodes)
2017-03-01 21:16:05 +01:00
Tianon Gravi
6e04fbf748 Merge pull request #31076 from AkihiroSuda/check-vendor
hack/validate/vendor: add more checks
2017-02-28 15:35:16 -08:00
Akihiro Suda
28797019b3 [EXPERIMENTAL] Integration Test on Swarm
This commit adds contrib/integration-cli-on-swarm/integration-cli-on-swarm.sh,
which enables IT to be running in parallel, using Swarm-mode and Funker.

Please refer to contrib/integration-cli-on-swarm/README.md

The test takes almost 5 to 6 minutes, with 10 n1-standard-4 GCE instances.

  $ ./contrib/integration-cli-on-swarm/integration-cli-on-swarm.sh --push-worker-image example.gcr.io/foo/bar --replicas 30 --shuffle
  2016/12/29 08:32:15 Loaded 1618 tests (30 chunks)
  2016/12/29 08:32:15 Executing 30 chunks in parallel, against "integration-cli-worker"
  2016/12/29 08:32:15 Executing chunk 0 (contains 54 test filters)
  ..
  2016/12/29 08:34:34 Finished chunk 28 [1/30] with 54 test filters in 2m19.098068003s, code=0.
  2016/12/29 08:34:38 Finished chunk 12 [2/30] with 54 test filters in 2m23.088569511s, code=0.
  2016/12/29 08:34:48 Finished chunk 10 [3/30] with 54 test filters in 2m33.880679079s, code=0.
  2016/12/29 08:34:54 Finished chunk 20 [4/30] with 54 test filters in 2m39.973747028s, code=0.
  2016/12/29 08:35:11 Finished chunk 18 [5/30] with 54 test filters in 2m56.28384361s, code=0.
  2016/12/29 08:35:11 Finished chunk 29 [6/30] with 52 test filters in 2m56.54047088s, code=0.
  2016/12/29 08:35:15 Finished chunk 1 [7/30] with 54 test filters in 3m0.285044426s, code=0.
  2016/12/29 08:35:22 Finished chunk 6 [8/30] with 54 test filters in 3m7.211775338s, code=0.
  2016/12/29 08:35:24 Finished chunk 25 [9/30] with 54 test filters in 3m9.938413009s, code=0.
  2016/12/29 08:35:30 Finished chunk 27 [10/30] with 54 test filters in 3m15.219834368s, code=0.
  2016/12/29 08:35:36 Finished chunk 9 [11/30] with 54 test filters in 3m21.615434162s, code=0.
  2016/12/29 08:35:41 Finished chunk 13 [12/30] with 54 test filters in 3m26.576907401s, code=0.
  2016/12/29 08:35:45 Finished chunk 17 [13/30] with 54 test filters in 3m30.290752537s, code=0.
  2016/12/29 08:35:53 Finished chunk 2 [14/30] with 54 test filters in 3m38.148423321s, code=0.
  2016/12/29 08:35:55 Finished chunk 24 [15/30] with 54 test filters in 3m40.09669137s, code=0.
  2016/12/29 08:35:57 Finished chunk 8 [16/30] with 54 test filters in 3m42.299945108s, code=0.
  2016/12/29 08:35:57 Finished chunk 22 [17/30] with 54 test filters in 3m42.946558809s, code=0.
  2016/12/29 08:35:59 Finished chunk 23 [18/30] with 54 test filters in 3m44.232557165s, code=0.
  2016/12/29 08:36:02 Finished chunk 3 [19/30] with 54 test filters in 3m47.112051358s, code=0.
  2016/12/29 08:36:11 Finished chunk 15 [20/30] with 54 test filters in 3m56.340656645s, code=0.
  2016/12/29 08:36:11 Finished chunk 11 [21/30] with 54 test filters in 3m56.882401231s, code=0.
  2016/12/29 08:36:22 Finished chunk 19 [22/30] with 54 test filters in 4m7.551093516s, code=0.
  2016/12/29 08:36:23 Finished chunk 21 [23/30] with 54 test filters in 4m8.221093446s, code=0.
  2016/12/29 08:36:25 Finished chunk 16 [24/30] with 54 test filters in 4m10.450451705s, code=0.
  2016/12/29 08:36:27 Finished chunk 5 [25/30] with 54 test filters in 4m12.162272692s, code=0.
  2016/12/29 08:36:28 Finished chunk 14 [26/30] with 54 test filters in 4m13.977801031s, code=0.
  2016/12/29 08:36:29 Finished chunk 0 [27/30] with 54 test filters in 4m14.34086812s, code=0.
  2016/12/29 08:36:49 Finished chunk 26 [28/30] with 54 test filters in 4m34.437085539s, code=0.
  2016/12/29 08:37:14 Finished chunk 7 [29/30] with 54 test filters in 4m59.22902721s, code=0.
  2016/12/29 08:37:20 Finished chunk 4 [30/30] with 54 test filters in 5m5.103469214s, code=0.
  2016/12/29 08:37:20 Executed 30 chunks in 5m5.104379119s. PASS: 30, FAIL: 0.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-02-28 02:10:09 +00:00
Victor Vieux
06f4049b8d update containerd to 665e84e6c28653a9c29a6db601636a92d46896f3
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-22 18:04:56 -08:00
Kenfe-Mickael Laventure
6f0e2c8c8b Bump runc to version a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-02-22 14:10:33 -08:00
Akihiro Suda
051b9a434f hack/validate/vendor: add more checks
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-02-16 07:43:03 +00:00
Victor Vieux
47396d6377 Switch to new versioning scheme
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-15 23:22:50 -08:00
Victor Vieux
3167bb8629 Merge pull request #29957 from ilianaw/amazonlinux-rpms
Build the docker-engine RPM for Amazon Linux
2017-02-15 09:40:03 -08:00
Tianon Gravi
52379fa76d Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
This is especially important for distributions like NixOS where `/bin/bash` doesn't exist, or for MacOS users who've installed a newer version of Bash than the one that comes with their OS.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2017-02-13 11:01:54 -08:00
Christophe Mehay
01273ad85f Force copy on make install to avoid Text file busy error
Signed-off-by: Christophe Mehay <cmehay@online.net>
2017-02-13 14:17:06 +01:00
John Howard
f48f1ff34c Windows: make.ps1 emit commit ID
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-02-09 20:01:23 -08:00
Iliana Weller
0b0216b67b
Build the docker-engine RPM for Amazon Linux
Signed-off-by: Iliana Weller <iweller@amazon.com>
2017-02-08 16:19:22 -08:00
Sebastiaan van Stijn
0a51ad2586 Merge pull request #30639 from Microsoft/jjh/makeshortcut
Windows: Make.ps1 default to build binaries
2017-02-07 07:39:33 -08:00
Sebastiaan van Stijn
4af2555a35 Merge pull request #30290 from vdemeester/carry-pr-27834
Carry #27834 — Do not require `.git` in the build context
2017-02-04 19:19:16 -08:00
Vincent Demeester
617be0ef2b
Bind mount .git 👼
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-03 21:00:32 +01:00
Alexander Morozov
12b8432413 Merge pull request #30644 from Microsoft/jjh/makecheckgoversion
Windows: make.ps1 validate go version
2017-02-02 11:39:56 -08:00
Vincent Demeester
8ed8366efd Merge pull request #29896 from Microsoft/jjh/gofmt
Windows: gofmt checker fixes
2017-02-02 12:12:57 +01:00
John Howard
a08e1304d4 Windows: gofmt check write out right filename
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-02-01 19:13:33 -08:00
Sebastiaan van Stijn
f5263c8074
install dirmngr if needed
as of Ubuntu Yakkety, dirmngr is now in a separate
package (see https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1634464)

this patch updates the install script to install
the dirmngr package if it's not installed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-01 12:17:23 -08:00
John Howard
5e7a9e523f Windows: make.ps1 validate go version
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-02-01 10:31:27 -08:00
John Howard
674247f5f0 Windows: Make.ps1 default to build binaries
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-02-01 09:54:04 -08:00
Victor Vieux
6365d8dd19 Merge pull request #30578 from tophj-ibm/add-p-z-to-release-deb
[ppc64le/s390x] add p/z to release-deb
2017-01-31 17:39:17 -08:00
Kenfe-Mickael Laventure
50886f49b9 Update containerd to version 78fb8f45890a601e0fd9051cf9f9f74923e950fd
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-31 14:36:51 -08:00
Christopher Jones
9db1d16053
[ppc64le/s390x] add p/z to release-deb
This adds ppc64le and s390x architectures to those supported
by hack/make/release-debs

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-01-30 17:44:33 -05:00
Tianon Gravi
1202592f6e Merge pull request #30480 from flx42/install-debian-stretch-support
install: map debian_version 9.X to debian stretch
2017-01-30 13:59:44 -08:00
Gaël PORTAY
425cd7d1c5 Fix installation using make install
The following command fails when the target directory does not exist.

	$ sudo make install DOCKER_MAKE_INSTALL_PREFIX=/opt/docker AUTO_GOPATH=1
	KEEPBUNDLE=1 hack/make.sh install-binary
	# WARNING! I don't seem to be running in a Docker container.
	# The result of this command might be an incorrect build, and will not be
	# officially supported.
	#
	# Try this instead: make all
	#

	---> Making bundle: install-binary (in bundles/1.14.0-dev/install-binary)
	Installing docker to /opt/docker/bin/
	cp: cannot create regular file '/opt/docker/bin/': No such file or directory
	make: *** [Makefile:119: install] Error 1

The patch installs the target directory before copying any binaries.

	$ sudo make install DOCKER_MAKE_INSTALL_PREFIX=/opt/docker AUTO_GOPATH=1
	KEEPBUNDLE=1 hack/make.sh install-binary
	# WARNING! I don't seem to be running in a Docker container.
	# The result of this command might be an incorrect build, and will not be
	# officially supported.
	#
	# Try this instead: make all
	#

	---> Making bundle: install-binary (in bundles/1.14.0-dev/install-binary)
	Installing docker to /opt/docker/bin/
	Installing dockerd to /opt/docker/bin/
	Installing docker-runc to /opt/docker/bin/
	Installing docker-containerd to /opt/docker/bin/
	Installing docker-containerd-ctr to /opt/docker/bin/
	Installing docker-containerd-shim to /opt/docker/bin/
	Installing docker-proxy to /opt/docker/bin/
	Installing docker-init to /opt/docker/bin/

Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
2017-01-27 17:34:38 -05:00
Alexander Morozov
002312d6c1 Merge pull request #30067 from tophj-ibm/add-more-detailed-install-script-message
add suggestions in failure message in install script
2017-01-27 13:25:34 -08:00
Felix Abecassis
ac3d74b0b4 install: map debian_version 9.X to debian stretch
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
2017-01-26 10:51:08 -08:00
Alexander Morozov
a69c4129e0 Merge pull request #28409 from dnephin/swagger-gen-more
Generate more types from the swagger spec
2017-01-26 10:35:34 -08:00
Kenfe-Mickaël Laventure
5e74dc11e3 Merge pull request #30391 from andrewhsu/check-changelog-date
validate CHANGELOG.md dates are in descending order
2017-01-24 11:18:21 -08:00
John Howard
f32b267d1c
Windows updates for .git in .dockerignore
Signed-off-by: John Howard jhoward@microsoft.com
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-24 14:43:02 +01:00
Vincent Demeester
fae6ca2bb4
Do not required .git in the build context
- export DOCKER_GITCOMMIT in the Makefile
- prioritize DOCKER_GITCOMMIT against the `git` command in
  `./hack/make.sh`
- Also add `integration-cli/bundles` to gitignore (it's generated when
  using integration-cli shell)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-24 14:42:57 +01:00
Vincent Demeester
ac30c4c06c Merge pull request #30385 from aaronlehmann/vendor-swarmkit-grpc-containerd
Vendor swarmkit, containerd, and related dependencies
2017-01-24 11:00:35 +01:00
Andrew Hsu
6cca6bf942 validate changelog dates are in descending order
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-01-23 19:19:35 -08:00
Brian Goff
5e46ad159d Merge pull request #30306 from AkihiroSuda/update-proxy
update docker-proxy to 7b2b1feb1de4817d522cc372af149ff48d25028e
2017-01-23 21:07:25 -05:00