c7e15c6493
Fix conflicts with newly updated selinux policies
...
The base selinux policies on centos/rhel/oraclelinux have all been
updated in a way that conflicts with the policies we install with
`docker-engine-selinux`. This patch fixes these conflicts.
In addition, removes special cases for old/unsupported versions of
fedora in our selinux package, and change to use a single minimum
version for the selinux base policy package, as this is the minimum
version required to use our selinux policy package.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: ec9a05e5e2e82363fae21131f869e2e34a597c50
Component: engine
2017-01-06 16:04:24 -05:00
548c0ae5fe
Merge pull request #29697 from yuexiao-wang/fix-docker-daemon
...
Update docker daemon to dockerd
Upstream-commit: 6129e6ce3ebd1bd6c9db76e196248c613fda6e40
Component: engine
2017-01-04 11:55:38 +01:00
f43a9bc718
Convert ContainerTopOKResponse from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 16bdbaaa3357dc1be7d74a283a3ed8d0d861a461
Component: engine
2017-01-03 11:47:47 -05:00
39aeb042a4
Generate GraphDriver from spec, and fix up image spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 8d5f558de016814ab3629bd0b5b7cc5fd98805b3
Component: engine
2017-01-03 11:47:47 -05:00
c049133b66
Generate ImageDeleteResponse from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5988b84e4fd9a512e3e8f98b3cfd7c030a4f013e
Component: engine
2017-01-03 11:47:47 -05:00
0a6e02b356
Generate ImageHistory from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b462c93edb44790ca309e3721950cb23be5d7d62
Component: engine
2017-01-03 11:47:44 -05:00
483e5a0688
Generate ContainerChanges from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b83d9bf6a9d92731573631ebd077a00e3f60c0cd
Component: engine
2017-01-03 09:35:40 -05:00
55c8f05f0d
Add validation for compose schema bindata.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 38d08b0bd1a8aa931cefd9caf837dbc9a4bb0a37
Component: engine
2016-12-28 14:45:44 -05:00
edfbbc6ec9
Replace vendor of aanand/compose-file with a local copy.
...
Add go-bindata for including the schema.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f5af9b9738892b5988f987ce5fbce6e31a10e768
Component: engine
2016-12-27 16:17:24 -05:00
8a1df96ade
Update docker daemon to dockerd
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 62cc802f6160b7fbb506f5307d96a564cbfb5f1f
Component: engine
2016-12-27 17:32:15 +08:00
d9da185a1c
Add warning on docker group suggestion
...
Signed-off-by: Eric Curtin <ericcurtin17@gmail.com >
Upstream-commit: 5b4a528b579c7a3582e0c0f707638f3ccf5969ad
Component: engine
2016-12-21 15:02:50 +00:00
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
cd8cef8c09
Windows: make.ps1 calc root
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8c93a41044b90834b8d3fcdb50ed3619ba3cbf71
Component: engine
2016-12-05 13:26:04 -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
2dd9139a7d
do not require custom build of tini
...
https://github.com/krallin/tini/issues/55#issuecomment-260507562
https://github.com/krallin/tini/issues/55#issuecomment-260538243
https://github.com/docker/docker/pull/28037
Signed-off-by: Elan Ruusamäe <glen@delfi.ee >
Upstream-commit: d7df7315971653e11bab124800a5938e7e5c6316
Component: engine
2016-11-16 00:08:55 +02:00
