Commit Graph

31631 Commits

Author SHA1 Message Date
4d3934c3e5 Merge pull request #28967 from yongtang/28946-support-plugin-docker-inspect
Support plugin type in `docker inspect`
Upstream-commit: 24ffa2fa7751e2f1fbdd7e0d5a640f24e8a5b803
Component: engine
2016-12-04 18:30:38 -08:00
e4ea064d47 run dnf upgrade before installing in fedora
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: ebd804bfb6af27b04514512676619b6a961551dc
Component: engine
2016-12-04 16:29:03 -08:00
ec683949ea Add bash completion for docker version --format
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3d43c48c1bbb8eaa2be4ec0d6203183b0f55b9d9
Component: engine
2016-12-04 14:13:14 -08:00
a51412a45d Fix bash completion for `docker service create|update
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: be5685e4bffc88a6cd3a093ee883c5335758266d
Component: engine
2016-12-04 12:11:33 -08:00
e66fab77ad Add bash completion for secret management
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 324dd3cfec756109df58128376b888684d8cf521
Component: engine
2016-12-04 11:25:41 -08:00
53a14ce389 Merge pull request #29106 from chrisgavin/docs-spelling-fix
Fix a spelling mistake in the docs.
Upstream-commit: eab3711999f776356861d08312ab2fc141b63faf
Component: engine
2016-12-04 14:17:27 +01:00
9c58790379 Fix a spelling mistake in the docs.
Signed-off-by: Chris Gavin <chris@chrisgavin.me>
Upstream-commit: 35c82f422d5db64baec6739490900f7f8fa7d7fd
Component: engine
2016-12-04 12:55:00 +00:00
957b4580ef Merge pull request #29098 from DieterReuter/add-support-for-qemu-builds
Add support for running builds within an QEMU emulation
Upstream-commit: d80fd833e70985361b4c9c020966f98c19f43698
Component: engine
2016-12-03 23:25:46 +01: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
085088f73e Fix issue where secret ID is masked by name
This fix tries to address the issue in 28884 where
it is possible to mask the secret ID by name.

The reason was that searching a secret is based on name.
However, searching a secret should be done based on:
- Full ID
- Full Name
- Partial ID (prefix)

This fix addresses the issue by changing related implementation
in `getCliRequestedSecretIDs()`

An integration test has been added to cover the changes.

This fix fixes 28884

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 3638ca4d14bcca9bc924f21314e4a1020cd5172f
Component: engine
2016-12-02 20:24:29 -08:00
35037b78fd Convert DanglingOnly to Filters for docker image prune
This fix convert DanglingOnly in ImagesPruneConfig to Filters,
so that it is possible to maintain API compatibility in the future.

Several integration tests have been added to cover changes.

This fix is related to 28497.

A follow up to this PR will be done once this PR is merged.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a6be56b54e871c4e7a6e72881770a64676c27c3c
Component: engine
2016-12-02 20:08:49 -08:00
c0aa09b760 Merge pull request #28988 from vdemeester/28985-dont-validate-hostname
Remove hostname validation as it seems to break users
Upstream-commit: 3cb310c21049f652dd00d20899cb1ece1ee9aa8f
Component: engine
2016-12-02 21:16:56 -05:00
30839117e7 Merge pull request #28735 from yongtang/28708-plugin-list-id
Add `ID` field for `docker plugin ls`
Upstream-commit: 51c5718aa357d3319f579caa39d313e4d55ff794
Component: engine
2016-12-03 02:37:09 +01:00
cc93b75a69 Merge pull request #29064 from vdemeester/29005-revert-builder-comments-line
Revert "Fix dockerfile parser with empty line after escape"
Upstream-commit: 6dff86f8b342c92e7686673fece7f31adf1bf836
Component: engine
2016-12-02 17:11:18 -08:00
095013e19b Merge pull request #28349 from allencloud/add-missing-code-in-api-docs
add missing status code of swarm cluster in api 1.24
Upstream-commit: 535db46be508d38a6f9f304a4e57e0c3d1c94af1
Component: engine
2016-12-03 02:04:05 +01:00
791ab405b2 update docs
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 30db51c169497f6d1f6d9517f25c237dd61182de
Component: engine
2016-12-02 15:24:11 -08:00
a9f58f81fd refactor plugin install
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: fa3b61a28f55d84afbbb978785ce9632123d12fa
Component: engine
2016-12-02 15:23:08 -08:00
6be6989ae5 Merge pull request #28994 from cpuguy83/allow_vol_recreate_for_same_driver
Fix out-of-band vol delete+create for same driver
Upstream-commit: 42aafe725ff20c6a97f7e4e06b3ec5ee9e615fb3
Component: engine
2016-12-02 15:12:13 -08:00
961c833b2d Merge pull request #29090 from vieux/update_poule_config
update poule.yml
Upstream-commit: 07489b8e79158f9d6dddbcb04cba87ff414f3d4b
Component: engine
2016-12-02 15:06:26 -08: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
fa830dbed4 update poule.yml
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: d2920bb31127aa83c8cd0c0534131342fd592406
Component: engine
2016-12-02 14:54:34 -08:00
8039795523 get rhel7.3 selinux-policy-devel pkg for centos-7
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: bfe5cab13bf0c83624fde0ab74f223bfa15d04c2
Component: engine
2016-12-02 14:39:24 -08:00
d218a8a1e8 add extra docker.te lines from rhel7.3 docker.spec
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 09e68fdd527e8e41cc618a0b3e8700528671613c
Component: engine
2016-12-02 14:18:58 -08:00
eaac95defc Add ID field for docker plugin ls
This fix tries to address the enhancement proposed in 28708 to display
ID field for the output of `docker plugin ls`.

This fix add `ID` field to the output of `docker plugin ls`

Related docs has been updated.

This fix fixes 28708.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 8a226ed6432a0614b25298fef872c98794f65ba9
Component: engine
2016-12-02 13:42:50 -08:00
34d513c5af Merge pull request #29075 from cpuguy83/29070_fix_tmpfs_opts
Fix issue where TmpfsOptions are not sent to swarm
Upstream-commit: 0fb0d67008157add34f1e11685e23a691db92644
Component: engine
2016-12-02 13:40:20 -08:00
8d0b8ac112 Support plugins in docker inspect
This fix tries to address the proposal raised in 28946
to support plugins in `docker inspect`.

The command `docker inspect` already supports
"container", "image", "node", "network", "service", "volume", "task".
However, `--type plugin` is not supported yet at the moment.

This fix address this issue by adding the support of `--type plugin`
for `docker inspect`.

An additional integration test has been added to cover the changes.

This fix fixes 28946.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 90bb2cdb9f15a9b1b9a4e2ea4242882665daac4e
Component: engine
2016-12-02 11:33:29 -08:00
789d09669e Merge pull request #29077 from dnephin/fix-swagger-gen-validate
Fix swagger-gen validation
Upstream-commit: bed5a0bc2c972243205cf18f30389d47a31537c0
Component: engine
2016-12-02 14:08:46 -05: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
080184cbbd add selinux policy for centos-7
This policy is from commit
583a67ffdf

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: e0852bec9613622a4a182d5170a59655c7cf1c6a
Component: engine
2016-12-02 10:26:00 -08:00
9a6dc26e71 Merge pull request #29069 from vdemeester/29031-manpages-buildarg
Use DOCKER_BUILD_ARGS on manpages make target
Upstream-commit: fddb5a7f2ab29be441bc797f7e79fffc5cc531d3
Component: engine
2016-12-02 12:30:36 -05:00
653a60cf01 Merge pull request #29039 from thaJeztah/fix-restart-limit-validation
Fix restartpolicy max-retry validation
Upstream-commit: 6e023ac7486edf7a2584cb918249b7e5fdaf91d2
Component: engine
2016-12-02 09:19:54 -08:00
7c952889cb Merge pull request #29071 from bfirsh/29045-use-singular-tag-names-in-swagger
Use singular tag names in swagger.yaml
Upstream-commit: 334366cdd9b9366f1a0e77d8bb6d41b1884bbfa2
Component: engine
2016-12-02 12:13:20 -05: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
1689338c62 Merge pull request #28789 from yongtang/28735-plugin-inspect-id-or-name
Allow `docker plugin inspect` to search based on ID or name
Upstream-commit: 57ace38103e1c9fc13e40c57b0fc77361e389f54
Component: engine
2016-12-02 08:46:47 -08:00
0f9b87c8d5 Fix issue where TmpfsOptions are not sent to swarm
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: a5b3649bfaca5958b25e42ab4f2fc5aa30929521
Component: engine
2016-12-02 11:43:47 -05:00
38292d7753 Merge pull request #28738 from sathieu/debootstrap_errors
Improve error reporting in mkimage/debootstrap
Upstream-commit: 1c696806412ba19f7bbb4dc50d353f737ff12d5b
Component: engine
2016-12-02 17:41:08 +01:00
161d115fd3 Merge pull request #29043 from duglin/Issue29014
Fix use of **/ in .dockerignore
Upstream-commit: 8895ee0b4d22fb48b496f3f0a0589c2b6c8031a6
Component: engine
2016-12-02 08:34:45 -08:00
18b40833fa Merge pull request #29066 from albers/completion-deploy
Add bash completion for experimental `docker deploy`
Upstream-commit: 2a3bbe571e0f659bb057886fc7071aebc943f8cc
Component: engine
2016-12-02 07:54:42 -08:00
c93795c45c Merge pull request #25851 from KingEmet/master
Add registry-specific credential helper support, take 2
Upstream-commit: 16035477003328b20d636f8a9429b4fcfdbb0792
Component: engine
2016-12-02 07:32:45 -08:00
b4bd0f1abb Use singular tag names in swagger.yaml
This is required to make the type generation put things in the
correct directory, but unfortunately makes the names in the
documentation menu look a bit crap.

I think the best solution would be to add a `x-display-name`
extension to tags to determine how the tags show up in the menu,
rather than it depend on the name of the tag. I shall do this in
a follow-up PR - for now, let's fix the breakage.

Fixes #29045

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 30a9249e1598ec3aa2ddb5885568f40466fa05e8
Component: engine
2016-12-02 14:14:36 +00:00
cf89bf07c6 Merge pull request #29046 from thaJeztah/pin-swagger-version
pin go-swagger 0.7.4
Upstream-commit: 3d1383f83460e8becdd7c8ed0d57e600b6e2696a
Component: engine
2016-12-02 08:41:21 -05:00
966bc9c966 Use DOCKER_BUILD_ARGS on manpages make target
This make it more consistent with the other image builds and allow to
build manpages behind a proxy for example.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 58505ffdeeb453035091ebe59d3de18193b18d1b
Component: engine
2016-12-02 14:20:30 +01:00
e8c489744e Revert "Fix dockerfile parser with empty line after escape"
This reverts commit 3e1b539e8d0ed4abf695b0a8c42346fba6d5a6b0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6e0666e622a8b1fc19c19eb490d218eebca15edc
Component: engine
2016-12-02 14:15:55 +01:00
19eecae26c Add bash completion for experimental docker deploy
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 10f567ec6aaa059626bbe32eb8786bf5a4b447fc
Component: engine
2016-12-02 04:28:10 -08:00
d154f4f76d Allow selective activation of experimental features in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: af84b7e4417b9b2cc90a8882b0874411e44abe76
Component: engine
2016-12-02 04:28:10 -08:00
330477b5f0 Fix use of **/ in .dockerignore
.dockerignore pattern of **/.foo incorrectly matched **/bar.foo
because **/.foo was getting converted into a .*\.foo regex
instead of (.*/)*\.foo

Closes #29014

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 376bb84c5c8f6183dbb88dae705e1de4182da4c9
Component: engine
2016-12-02 03:58:54 -08:00
75273b586a Print checkpoint id when creating a checkpoint
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: f1df2d5a2e563bd38e797e33bce444edd346521c
Component: engine
2016-12-01 23:30:14 -05:00
25a255f4fc add missing status code in api docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 9a1f7b6b0bba7bd28c5ae1fabef7ef267e5fbfbd
Component: engine
2016-12-02 11:24:45 +08:00
538d93fdc1 Return error for incorrect argument of service update --publish-rm <TargetPort>
Currently `--publish-rm` only accepts `<TargetPort>` or `<TargetPort>[/Protocol]`
though there are some confusions.

Since `--publish-add` accepts `<PublishedPort>:<TargetPort>[/Protocol]`, some user
may provide `--publish-rm 80:80`. However, there is no error checking so the incorrect
provided argument is ignored silently.

This fix adds the check to make sure `--publish-rm` only accepts `<TargetPort>[/Protocol]`
and returns error if the format is invalid.

The `--publish-rm` itself may needs to be revisited to have a better UI/UX experience,
see discussions on:
https://github.com/docker/swarmkit/issues/1396
https://github.com/docker/docker/issues/25200#issuecomment-236213242
https://github.com/docker/docker/issues/25338#issuecomment-240787002

This fix is short term measure so that end users are not misled by the silently ignored error
of `--publish-rm`.

This fix is related to (but is not a complete fix):
https://github.com/docker/swarmkit/issues/1396

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c4d773cdfe94a8ba4862a0f8df237b0fc31d2337
Component: engine
2016-12-01 17:46:53 -08:00