d72bbfcb65
Update build-deb to make correct use of DOCKER_BUILD_PKGS
...
An environment variable cannot directly be used as a bash array, this
patch loops through all the IFS separated value (which default to
space) instead.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 20e1b9593ee1d23c5df7c78903d27a72cee711e8
Component: engine
2016-05-02 11:22:01 -07:00
31d554228f
Merge pull request #22448 from twistlock/authorization_error_code
...
Fix authorization issue - when request is denied return forbbiden exist code (403).
Upstream-commit: 2f6e3b0ba027b558adabd41344fee59db4441011
Component: engine
2016-05-02 11:04:19 -07:00
6f46f75951
Merge pull request #22367 from dnephin/fix_dockerd_lookup_and_warn
...
Fix lookup of dockerd when called from outside of $PATH
Upstream-commit: ba6209f7448865885519face97b1ffe30396939e
Component: engine
2016-05-02 13:58:57 -04:00
b411e1c47f
Merge pull request #22247 from vdemeester/22240-implicit-pull
...
Fix #22240 do not pull all the tags implicitely
Upstream-commit: 7bb23f7acc5a0d3fc54e1e08bb2f1a88836972d7
Component: engine
2016-05-02 10:23:10 -07:00
b33e8d5489
Fix authorization issue - when request is denied return forbbiden exist code (403).
...
- Return 403 (forbidden) when request is denied in authorization flows
(including integration test)
- Fix #22428
- Close #22431
Signed-off-by: Liron Levin <liron@twistlock.com >
Upstream-commit: 526abc00b138a168fb248c98efd1b90fdf679036
Component: engine
2016-05-02 19:14:48 +03:00
86a8cdbb4b
Raise a more relevant error when dockerd is not available on the platform.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 8983d42988ad59f1a19a0f4e9e88dfec8b1be690
Component: engine
2016-05-02 11:59:25 -04:00
56c66fb13e
When exec'ing dockerd, look for it in the same directory as the docker binary first, before checking path.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9db86a38cdc183cefade48103b9ddb44ce3032fe
Component: engine
2016-05-02 11:52:50 -04:00
be36ed6341
Merge pull request #22452 from cpuguy83/fix_zsh_completion_psformat
...
Make zsh completion work when ps output is custom
Upstream-commit: 2a6980c5cb111514d1929c619b8fc8fc2df00fd5
Component: engine
2016-05-02 17:39:46 +02:00
5a1389f4b1
Make zsh completion work when ps output is custom
...
When `psFormat` is used in the docker client config json, if the output
is non-standard it breaks some of the completion handling for
containers.
This fixes that by ensuring that calls to `ps` use the default/standard
formatting by calling `docker ps --format 'table'`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: ba3f8a9fefc9da16dc00cf01f2b1d32ec54ce20d
Component: engine
2016-05-02 09:45:01 -04:00
9fb835ad73
Fix #22240 do not pull all the tags implicitely
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 54ebe42de9c359e0c9f171953bd787bb997d719e
Component: engine
2016-05-01 14:46:04 +02:00
8e492423bb
Merge pull request #22439 from sunyuan3/the
...
remove "the" in docs.
Upstream-commit: b0a5762348f3810b67ef3804a464961812d18eb6
Component: engine
2016-05-01 13:50:41 +02:00
ef3d0f56d0
remove "the" in docs.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 043c9ef076477a391a58792930100402b48bbe1e
Component: engine
2016-05-01 15:37:11 +08:00
e7d7019314
Vendor engine-api with pull fixes
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: ba901bb062d8f1fbc7cc8d9fae5b7365afb66e69
Component: engine
2016-04-30 17:24:25 +02:00
8a3d4c08a9
Merge pull request #22434 from sdurrheimer/zsh-completion-network-ls-driver-filter
...
Add zsh completion for 'docker network ls -f driver'
Upstream-commit: e385faa35b5026ed27f59124d632ea30e9d647d1
Component: engine
2016-04-30 10:54:28 -04:00
04f7572de5
Merge pull request #22282 from fntlnz/docs-authorization-plugins
...
Mention the fact that authz plugins are available today
Upstream-commit: d32345240c39b990a00d5d3e740a90a1f57d1251
Component: engine
2016-04-30 13:23:58 +02:00
236d071954
Add zsh completion for 'docker network ls -f driver'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d6780c319086379023894c6ae26301bce6b01b98
Component: engine
2016-04-30 13:07:03 +02:00
d380357613
Merge pull request #22319 from thaJeztah/network-driver-filter
...
Add "driver" filter for network ls
Upstream-commit: 7a5658129740cd8e4345246758aa30fe3c835d10
Component: engine
2016-04-30 10:38:10 +02:00
9d2d2e1d41
Merge pull request #22372 from dnephin/cli_cleanup
...
Reorganize client and cli packages
Upstream-commit: 90dfb3dacc56d789b70f5b5f3da6791465706c6c
Component: engine
2016-04-29 17:31:39 -07:00
dd55588acd
Merge pull request #22426 from sdurrheimer/zsh-completion-network-ls-filters
...
Add zsh completion for 'docker network ls -f {id,name,type}'
Upstream-commit: b391a5914c5cd040f9f85ceaab04cafca6c34461
Component: engine
2016-04-29 17:29:38 -07:00
55b8abe106
Merge pull request #22241 from bfirsh/update-remote-api-client-libraries-page
...
Update remote API client libraries page
Upstream-commit: cd418701326f91c71194e2e09d71a0692705de78
Component: engine
2016-04-30 00:39:29 +02:00
98448735e8
Merge pull request #22427 from tonistiigi/simplify-blkio
...
Simplify blkio resources setup in spec
Upstream-commit: 5e58a583fc0a9dd208c60690bdc7580209446e93
Component: engine
2016-04-29 15:16:33 -07:00
f2a5bf90ee
Merge pull request #22406 from allencloud/fix-typos
...
fix typos in CHANGELOG.md and pull.go
Upstream-commit: e44a868bc4a0fa2cd2cd3a3b269870ed745da50b
Component: engine
2016-04-30 00:00:48 +02:00
d2c630a173
Simplify blkio resources setup in spec
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 668f0a2a4c04e550c957cf5eff6618c6b40d1252
Component: engine
2016-04-29 13:39:04 -07:00
295ba6c97d
Add zsh completion for 'docker network ls -f {id,name,type}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 8a51f9511cffd8d95dd46fc1b3663a7e7e543949
Component: engine
2016-04-29 22:38:10 +02:00
e0bc3fa222
Merge pull request #22417 from michael-holzheu/s390x-dockerfile-add-registry-and-notary
...
Dockerfile.s390x: Build correct registries and notary client
Upstream-commit: aa537a367c72174ac01fb64d6c86721c9a20bb0b
Component: engine
2016-04-29 13:59:14 -04:00
3f31ac2b65
Merge pull request #22340 from Microsoft/jstarks/split-service
...
Windows: Support running dockerd as a service
Upstream-commit: f114ab21de33062c8b1db83ecd772691b9ec05c4
Component: engine
2016-04-29 10:47:20 -07:00
6e47a4bf6c
Merge pull request #22419 from cpuguy83/reflection_is_for_mirrors
...
Remove reflection on CLI init
Upstream-commit: 9a58dd22f05fded46665edb10aabcf0551176863
Component: engine
2016-04-29 19:42:19 +02:00
943ca18608
Dockerfile.s390x: Build correct registries and notary client
...
Sync with other Dockerfiles:
1) Adjust REGISTRY_COMMIT
2) Add old shema1 registry
3) Install notary client
This fixes the following testcases:
DockerSchema1RegistrySuite:
- SetUpTest
DockerTrustSuite:
- TestTrustedBuildTagFromReleasesRole
- TestTrustedBuildTagIgnoresOtherDelegationRoles
- TestTrustedPullReadsFromReleasesRole
- TestTrustedPullIgnoresOtherDelegationRoles
- TestTrustedPushWithReleasesDelegationOnly
- TestTrustedPushSignsAllFirstLevelRolesWeHaveKeysFor
- TestTrustedPushSignsForRolesWithKeysAndValidPaths
- TestTrustedPushDoesntSignTargetsIfDelegationsExist
DockerRegistrySuite:
- TestPullManifestList
- TestCrossRepositoryLayerPush
DockerHubPullSuite:
- TestPullAllTagsFromCentralRegistry
v2: Sync comments on all architectures
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
Upstream-commit: 6e4c87c06e95f8c1aea0fa6d6575ff8c9faf8e03
Component: engine
2016-04-29 19:24:49 +02:00
b5a44200d5
Remove reflection on CLI init
...
before:
```
$ time docker --help
real 0m0.177s
user 0m0.000s
sys 0m0.040s
```
after:
```
$ time docker --help
real 0m0.010s
user 0m0.000s
sys 0m0.000s
```
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5c8950e84d2384919f45209f8cc4cbf00ff29015
Component: engine
2016-04-29 11:57:46 -04:00
a1b67ec8fd
Merge pull request #22418 from thaJeztah/update-event-api-docs
...
update API example response for docker events
Upstream-commit: 55bc0a344085338826bca00ea75ffb9e4b5e0c79
Component: engine
2016-04-29 17:53:16 +02:00
7c03d41081
update API example response for docker events
...
the events API was rewritten in 723be0a3325799fd6b2a6b689af54f5a07edf992,
but the example response in the documentation doesn't reflect the actual output
this fixes the example response
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3932d46a7878e3e75d8119f332b927fd2107cb32
Component: engine
2016-04-29 17:37:04 +02:00
7762c76c64
fix typos in CHANGELOG.md and pull.go
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 1ac4c61c10b7753607d8cb17421b90475c1bd0d6
Component: engine
2016-04-29 23:33:15 +08:00
6e410ce449
Add "driver" filter for network ls
...
This add a new filter to 'docker network ls'
to allow filtering by driver-name.
Contrary to "ID" and "name" filters, this
filter only supports an *exact* match.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 23e418b6c966a43a463a064053ce0c741b8e5159
Component: engine
2016-04-29 16:22:26 +02:00
19786ac0a4
Merge pull request #22202 from michael-holzheu/s390x-add-libseccomp-2.3.0
...
Dockerfile.s390x: Add upstream libseccomp to compile runc
Upstream-commit: 24a8de2b60c68c72924d61cb0c4587944e3be5b4
Component: engine
2016-04-29 08:13:13 -04:00
a625365923
Merge pull request #22370 from mlaventure/fix-experimental-builder
...
Allow specifying the apt mirror to use when generating deb packages
Upstream-commit: 717842fbdeeec3e3bd56525e998a2ffcb087b4d0
Component: engine
2016-04-28 16:26:29 -04:00
ebb9e8de8c
Allow specifying the apt mirror to use when generating deb packages
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: d0a65a03e9f789b73956e2d30447a385d6531dfe
Component: engine
2016-04-28 13:05:34 -07:00
8d43701c21
Merge pull request #22388 from fy2462/exec-add-newline
...
Fix bug: exec non-exist command miss a "\n"
Upstream-commit: ca611fdea28ea559f689df97484564bebf5d472b
Component: engine
2016-04-28 11:30:28 -04:00
35425a4320
Merge pull request #21613 from wzyboy/support-unixgram-syslog-address
...
Support unixgram syslog address
Upstream-commit: dbee44c9e0d9f8afbbb86efd2c0bcbd66440cbbc
Component: engine
2016-04-28 11:06:17 -04:00
1bab3fd622
Merge pull request #22396 from sbellem/docs-typo-fix
...
Fix typo
Upstream-commit: 0bb4c902e091762e88d54699ba7677c9e62a3cbd
Component: engine
2016-04-28 15:27:28 +02:00
507bf1ac80
Fix typo
...
Signed-off-by: Sylvain Bellemare <sylvain@ascribe.io >
Upstream-commit: 63aa03ce0a9d2390f684da3403c1cd0e004592d1
Component: engine
2016-04-28 15:15:08 +02:00
459ceabfe5
Merge pull request #22391 from thaJeztah/update-changelog-in-master
...
merge changelog for v1.11.1 into master
Upstream-commit: feb8f0e10ea151608ed793ec0a88c1a3749f896d
Component: engine
2016-04-28 09:11:25 -04:00
dd728e39c9
Merge pull request #22320 from thaJeztah/docs-remove-duplicate-sentence
...
docs: remove duplicate line in "Understand the architecture"
Upstream-commit: d37e22b6237ba99adacf200e823d50aade38c551
Component: engine
2016-04-28 12:45:08 +02:00
d722206339
Merge pull request #22344 from cpuguy83/seccomp_for_centos
...
centos:7/oraclelinux:7 now includes libseccomp 2.2.1
Upstream-commit: 09021d6841b825dbaab901a34617358b03ae17ac
Component: engine
2016-04-28 12:26:22 +02:00
122b55086b
Add changelog for v1.11.1
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
(cherry picked from commit 4146b8b69b4fcc5a6ddbbac63f316695c2dbbb8f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ca0c1becea921300599b44dc5b4f2d6e463309ec
Component: engine
2016-04-28 12:15:17 +02:00
da56d24b50
Merge pull request #22269 from coolljt0725/skip
...
Skip TestBuildNotVerboseFailure if no network
Upstream-commit: bf7307558e42e0ad9f41316f397d880e6d4981b6
Component: engine
2016-04-28 11:19:56 +02:00
1f29278b9e
Fix bug: exec non-exist command miss a "\n"
...
When exec a non-exist command, it should print a newline at last.
Currently:
```
$ docker exec -ti f5f703ea2c0a144 bash
rpc error: code = 2 desc = "oci runtime error: exec failed: exec:
\"bash\": executable file not found in $PATH"$
```
Signed-off-by: Feng Yan <fy2462@gmail.com >
Upstream-commit: 8bf5613c1aca634e517e895e90e74f4263cf030f
Component: engine
2016-04-28 16:39:00 +08:00
3cf7d71fdb
Merge pull request #21641 from yongtang/21595-discrepancy-on-hostname-validation
...
API/CLI discrepancy on hostname validation (#21595 ).
Upstream-commit: 78eb8a5fb932c2b11df47e7a22c05fe485e03adb
Component: engine
2016-04-28 09:25:13 +02:00
48a9de5e52
Support unixgram syslog address
...
- Consider unixgram:// as a valid URL prefix
- Parse unixgram:// addresses
- Update docs
Signed-off-by: Zhuoyun Wei <wzyboy@wzyboy.org >
Upstream-commit: 57fad95e4352c72c852d740e54fd693a446c552f
Component: engine
2016-04-28 11:04:50 +08:00
600e267c7f
Skip TestBuildNotVerboseFailure if no network
...
TestBuildNotVerboseFailure use a non-exist image busybox1,
it requires network connection to access to Dockerhub, skip
this test if there is no network.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 9ab0aa43365cd648d7681a58b60e91f791bc920a
Component: engine
2016-04-27 21:29:05 -04:00
9074d644d1
Merge pull request #22362 from ZJU-SEL/update-doc
...
update cgroup link in doc of run
Upstream-commit: deb6ea4702924ff390e4a57414f735b18e4d7185
Component: engine
2016-04-28 00:48:47 +02:00
