Commit Graph

1976 Commits

Author SHA1 Message Date
9e120272c4 Fix regular expression for PowerShell DCO check
Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: 0ce6c12f88b556cf1eabd2f809c2b23cbea229c7
Component: engine
2016-12-20 15:32:39 -08:00
42f938d12c fix powershell dco check
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 611a633ba4e11215a23d8b405a537346b10d9657
Component: engine
2016-12-16 23:48:27 +01:00
c770ae1fee Merge pull request #29208 from andrewhsu/validate-changelog
validate CHANGELOG.md is well-formed
Upstream-commit: 59ba895a0f610f5bf34ef6748540af1509910bea
Component: engine
2016-12-12 17:59:41 +01:00
09e95b9a9f Merge pull request #23480 from thaJeztah/remove-unsupported-distros
Remove unsupported distros from install script
Upstream-commit: 7caf77ac185b9ae16e4d0756faf01b360c0816af
Component: engine
2016-12-09 22:38:18 +01:00
2c58cb78a9 Merge pull request #29275 from cpuguy83/set_inspect_type_emptyfs
Set inspect type in ensure-emptyfs
Upstream-commit: f2533c0266f5447dfed9981f2c67c334900afa79
Component: engine
2016-12-09 21:40:58 +01:00
4af91ff190 Merge pull request #29231 from Microsoft/jjh/dcocheck
Windows: make.ps1 fix DCO check
Upstream-commit: b8e15537656ce64db32b0972ce0c8adbce405bae
Component: engine
2016-12-09 17:07:31 +01:00
45f211246a Set inspect type in ensure-emptyfs
This keeps the test daemon logs from being flooded with calls to lookup
emptyfs for other types.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 71ca76e8f20c33d313d2d0dffba0eddf39e69f9e
Component: engine
2016-12-09 08:26:05 -05:00
42fb04bb4f validate changelog format
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: aec52767b99a44afed5c9c132f88a6a41464d2e0
Component: engine
2016-12-07 22:30:56 -08:00
14c40e7945 Windows: make.ps1 fix DCO check
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e538c1fdca16cadf59f1d19df75857c8b2c4af06
Component: engine
2016-12-07 17:58:07 -08:00
69c140812c Merge pull request #29174 from lhsvobodaj/29132-add-build-args-to-build-deb-script
Add variable DOCKER_BUILD_ARGS to build-deb script
Upstream-commit: 74ecec9199a2f1e9ff1ce52e254c8de65882ab4a
Component: engine
2016-12-07 09:02:47 -08:00
ea74b6e388 Make sure we don't run integration cli test if compilation fails
Otherwise, while using test-integration-shell, it runs the tests using
the previously compiled test binary.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: aefbc034445df17c98f1247b100e2b6a2ed22e84
Component: engine
2016-12-06 23:37:08 +01:00
a8eab9725a Add variable DOCKER_BUILD_ARGS to build-deb script
Some containers were being built (`docker build`) without
the DOCKER_BUILD_ARGS variable, which was causing some
issues because of the lack of network proxy configuration.

Fixes #29132

Signed-off-by: Luiz Svoboda <luizek@gmail.com>
Upstream-commit: 63aaf5e316d7b51db9be94bcb16dab07fdf1fdb4
Component: engine
2016-12-06 10:17:41 -02:00
8290729448 Merge pull request #29145 from Microsoft/jjh/make
Windows: make.ps1 Throw exception on failure
Upstream-commit: 080d7a554322076c4347b3d3f203289eb949cc74
Component: engine
2016-12-06 12:10:56 +01:00
f9e126f19d remove bonus whitespace
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: 8d47858f96c7ef03a9d3543e0994119390acb1bb
Component: engine
2016-12-05 20:21:25 -08:00
7eaf67346f Merge pull request #29082 from runcom/fix-rpm-buildtime
hack/make.sh: fix BUILDTIME
Upstream-commit: 29e728e9b2a088a8b7845db397ea2f51dc2554d8
Component: engine
2016-12-05 16:31:29 -08:00
7c4ac2a285 Windows: make.ps1 Throw exception on failure
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8c22a00b77043db50a1b4837a66dfb27dab3f070
Component: engine
2016-12-05 09:58:56 -08:00
ba5cfa2cc3 Fix bundle dir for integration-cli
test.main was unexpectedly created under docker/integration-cli/bundles/VERSION/test-integration-cli directory.
This commit moves test.main to docker/bundles/VERSION/test-integration-cli.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 4522f14f8cd0d51ced18c24e0d7929409b82a212
Component: engine
2016-12-05 09:07:38 +00:00
beb7c759eb Add support for running builds within an QEMU emulation
With this change we can run a Docker build in QEMU and build ARM or ARM64 binaries directly on an Intel build machine. This feature already supports building with Docker4Mac (Beta31). So it's easy for a developer to compile and test the Docker binaries locally on his dev machine w/o the need of the target hardware. Another use case would be to run builds on a clound CI like Travis to get an instant feedback loop for PR's, all on a common Intel platform w/o the need to set up the CI system on the target hardware.

Usage: build static Docker binaries for ARM 32-bit
```
DOCKER_ENGINE_OSARCH="linux/arm" make binary
```

Usage: build static Docker binaries for ARM64 aka AARCH64
```
DOCKER_ENGINE_OSARCH="linux/arm64" make binary
```

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
Upstream-commit: 0d7e118f0199102924c318c80b7e7a10720e1874
Component: engine
2016-12-03 13:53:59 +01:00
ed70bdfd73 hack/make.sh: fix BUILDTIME
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 7b1f77dcbc4c7cda754613f424f937056d3206ec
Component: engine
2016-12-03 09:09:41 +01:00
40bdf9e61c Merge pull request #28964 from Microsoft/jjh/make
Windows: make.ps1 and dockerfile for native builds
Upstream-commit: ab56641ab5ee3fc7815f7f60a4d55c5b93295441
Component: engine
2016-12-02 23:56:42 +01:00
05a05baa0e Windows: make.ps1 and Dockerfile for native builds
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 155435b6ceeb05b2927ecc726216666b898b6459
Component: engine
2016-12-02 10:46:15 -08:00
d5e6a04752 Fix swagger-gen validation.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f247a99c6ddcaa8448d339b84ae1a029a3048a77
Component: engine
2016-12-02 12:11:35 -05:00
9baf8e091f Merge pull request #28455 from Microsoft/jjh/autogen
Windows: Native autogen
Upstream-commit: 5afdacb20ecbae338480a0382d62f7aabb6b9e8a
Component: engine
2016-11-22 18:18:12 -08:00
cbb630a1a7 Merge pull request #28703 from runcom/full-hash-commit-runc
hack/dockerfile/binaries-commits: use full commit hash for docker info
Upstream-commit: 658b89192f54285ace594add8114d30a6ea66a66
Component: engine
2016-11-22 21:14:00 +01:00
419cdb27d7 Merge pull request #28595 from anusha-ragunathan/plugin_timeout
Allow HTTP client timeout to be configurable on plugin enable.
Upstream-commit: 677e14643c79184ca9d8123dd3e91e0444b1cac3
Component: engine
2016-11-22 10:17:10 -08:00
9eb244a92c skip solaris and allow dry run control points
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: f60541069cca1a4c886f5c2198d2ccd07f4ee764
Component: engine
2016-11-22 01:42:52 -08:00
6ac00da856 hack/dockerfile/binaries-commits: use full commit hash for docker info
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: fa15d5ed0f96592b49c2e25c06e92d51999fb29b
Component: engine
2016-11-22 08:59:57 +01:00
c21adc5da9 Add HTTP client timeout.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 83ca993c154d56e03d6f95a3f8351c48b3ed3e29
Component: engine
2016-11-21 13:11:40 -08:00
6038277781 skip api/types/container/ (like golint) and fix one pkg
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 79a891efb7365e4f7d129a0142e66d2852781608
Component: engine
2016-11-18 16:33:50 -08:00
b5a2933b08 Merge pull request #28590 from mlaventure/update-containerd
Update containerd & runc
Upstream-commit: e67664887da4b9657ead8f8e39a6a6c3fe122c99
Component: engine
2016-11-18 14:08:56 -08:00
2efd6e2078 Return warnings from service create and service update when digest pinning fails
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.

This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 948e60691e523022f88e7f8129f02106a0f8826c
Component: engine
2016-11-18 09:31:31 -08:00
5cab628042 Update containerd & runc
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 8b1aeb22febdb60e29b4d1ee52c6d4139af1cd62
Component: engine
2016-11-18 08:15:20 -08:00
0efec2f427 Windows: Native autogen
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 64cc7677bf891438a218cad6724ba86d70dcadec
Component: engine
2016-11-17 13:48:57 -08:00
182a7a908f Update Tini to fix photon build-rpm compilation errors
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ce33d4e1c3d2ca3672a4d7e8e2b553de842fef30
Component: engine
2016-11-17 22:03:32 +01:00
73004a6b58 Merge pull request #28485 from Microsoft/jjh/remove-make.sh-old-hack
Remove old Windows hack in make.sh
Upstream-commit: 77fca662dd71da6be7fd4bb3b40f7074b355607e
Component: engine
2016-11-16 11:38:19 -08:00
d37cd17630 Merge pull request #28420 from vieux/update_tini
update tini to a87614212b3a51a9cad57ff7989103a841546745
Upstream-commit: 1c29c3a54d7194148d569ef2cbac53dbc12a5165
Component: engine
2016-11-16 09:46:11 -08:00
a498054fff Remove old Windows hack in make.sh
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5e6f8cb4a7f8bf294b3b459d2c2afed6d69fcdf1
Component: engine
2016-11-16 09:29:38 -08:00
fadee20b95 Build docker incrementally by default
This speeds up docker build time drastically. It still possible to
disable this by setting `DOCKER_INCREMENTAL_BUILD` to `0` (and this is
what should be done on the CI).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2c342cff79d6e781e06258cefcd2b2b1a23396ec
Component: engine
2016-11-15 16:23:48 +01:00
94bcd2ce8a update tini to a87614212b3a51a9cad57ff7989103a841546745
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: b1a91dcc0f0ba0bbad1d70943b423464b500657f
Component: engine
2016-11-14 17:47:04 -08:00
9db7e23ff6 Remove extra binaries commit variables from windows build
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 17df5593ebcd471b0bbf0ea9d6e060ee3447850a
Component: engine
2016-11-11 08:24:17 -08:00
4d7a48f6ec Merge pull request #27955 from mlaventure/runc-docker-info
Add external binaries version to docker info
Upstream-commit: 0427afa409f1a2034537b4659bf7a3a1454fa617
Component: engine
2016-11-10 21:27:14 -08:00
949cb1d2cb Add Fedora 25 RPMs
This is a temporary version for building
Fedora 25. Fedora 25 will be released during
code-freeze, and is currently in beta, so no
official images are available yet.

Current release date is scheduled for 2016-11-15
https://fedoraproject.org/wiki/Releases/25/Schedule

Once released, the image will be updated for
GA

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c4f1cb779179b6145702174614706c462a5ceaae
Component: engine
2016-11-10 20:44:30 +01:00
7e57dfce61 Merge pull request #27829 from DieterReuter/fix-aptrepo-distro-versions
Fix creation of the APT repo directory structure for similar distros
Upstream-commit: 44c816a808198a38c3445c32614d4cef5d9f2736
Component: engine
2016-11-10 16:23:27 +01:00
1a735f0856 Add validate/swagger-gen
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: be807639b0bf0d8589f4566896b3eb4114724b37
Component: engine
2016-11-09 14:44:16 -05:00
515ebb7b5c Add expected 3rd party binaries commit ids to info
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 2790ac68b32b399c872de88388bdccc359ed7a88
Component: engine
2016-11-09 07:42:44 -08:00
64d7644ec8 Replace grimes with tini
There is no reason to duplicate efforts and tini is well built and
better than grimes.  It is a much stronger option for the default init
and @krallin has done a great job maintaining it and helping make
changes so that it will work with Docker.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: d58b47623b252803f5cd12f6d9ca584d1587ab22
Component: engine
2016-11-08 14:42:54 -08:00
20482eac18 Update containerd to 8517738ba4b82aff5662c97ca4627e7e4d03b531
This version:
 - properly follow context cancellation on Start and Exec
 - add support for Solaris
 - ensure exec exit events are always seen before init's

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 0aa17f0f6090ddeefaa6a0bc618aeb8baf3afa3f
Component: engine
2016-11-08 09:47:41 -08:00
bea6724b50 Merge pull request #28038 from bfirsh/add-validate-swagger
Validation for swagger.yaml
Upstream-commit: 9075aa4ddd9f721fda24704de5d54bf36445e330
Component: engine
2016-11-08 10:57:01 +01:00
f364a8ccb7 Merge pull request #28056 from LK4D4/solaris_me
Add functional support for Docker sub commands on Solaris
Upstream-commit: 109c26bd7482280946e356b33f17f4d82112dff3
Component: engine
2016-11-07 16:46:18 -08:00
5a7cb6c536 Add swagger.yaml validation
- yamllint to ensure it is a valid YAML file
- go-swagger validate to ensure it is a valid swagger file

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 5c4abd107a4e50b9f2d29f98275a5b5b86c5f50f
Component: engine
2016-11-07 11:03:21 -08:00