1a59a831b3
Merge component 'cli' from git@github.com:docker/cli master
2017-07-14 20:04:39 +00:00
c2eba39c13
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-07-14 20:03:09 +00:00
a50b8e5956
Merge pull request #335 from coolljt0725/add_env
...
Add DOCKER_BUILD_ARGS to support build with proxy
Upstream-commit: 0c8d401cd8
2017-07-14 11:41:44 -04:00
0667ef33f8
Add DOCKER_BUILD_ARGS to support build with proxy
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 7d8681fadb
2017-07-14 05:20:18 -04:00
c8dfc96c37
Merge pull request #324 from cyphar/libdm-debug-flag-docs
...
docs: add documentation for dm.libdm_log_level
Upstream-commit: de4c546b7e
2017-07-14 00:58:38 -07:00
becbfbd6d3
docs: add documentation for dm.libdm_log_level
...
This is a new option added specifically to allow for debugging of bugs
in Docker's storage drivers or libdm itself.
Signed-off-by: Aleksa Sarai <asarai@suse.de >
Upstream-commit: c7710819a5
2017-07-14 16:52:33 +10:00
0393b35079
Merge pull request #34 from andrewhsu/check-clean
...
check if build dir exists before chown
Upstream-commit: 6829cb8fdb1ffad738d9742329bf83de1b2aad8b
Component: packaging
2017-07-13 21:50:19 -07:00
16b3113441
check if build dir exists before chown
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 46dd23f1fc2863741783f0584dad1a42815e5438
Component: packaging
2017-07-14 04:35:47 +00:00
6da354bd2c
Merge pull request #10 from seemethere/reflective_alpine_images
...
Add reflective alpine images to other components
Upstream-commit: f373edf0ac49203be0b8dd66f75237e18927c553
Component: packaging
2017-07-13 15:29:20 -07:00
480f1b0a2a
ALPINE -> ALPINE_IMG
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: ee25bc2379126a75116ce66daffda6c7d3f41d42
Component: packaging
2017-07-13 15:19:22 -07:00
fa401fa1b5
Add reflective alpine images to other components
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 0435cef6a945dc1c57b51cb24b36aaf66be8d8cc
Component: packaging
2017-07-13 15:16:51 -07:00
3c42375fa5
Merge pull request #206 from dnephin/why-cross-so-slow
...
Faster CI
Upstream-commit: e3746d388e
2017-07-13 09:36:18 +02:00
38d61f1225
Merge pull request #271 from tych0/password-stdin
...
Password stdin
Upstream-commit: ae38f202bb
2017-07-12 17:08:11 -07:00
e7e9eef224
Merge pull request #328 from cyli/de-duplicate-CAcert-flag
...
Fix warning in docker CLI when `swarm ca` is called with flags other than `--rotate`
Upstream-commit: dcd788b100
2017-07-12 16:45:50 -07:00
ac7952530f
Fix warning in docker CLI when swarm ca --ca-cert, etc. flags are passed,
...
and add a test.
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 4615c92f66
2017-07-12 14:56:28 -07:00
34e1a128cc
Merge pull request #329 from dnephin/fix-linter-master
...
Update gometalinter
Upstream-commit: 6d74d8c13c
2017-07-12 13:21:24 -07:00
5f448ae97b
Update gometalinter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7a8f75a25a
2017-07-12 15:21:41 -04:00
0ca3fff735
Merge pull request #326 from dnephin/fix-merged-pr-conflicts
...
Fix test and lint failures on master
Upstream-commit: 25d9594f0b
2017-07-12 09:34:14 -07:00
cdbad2a1c4
Fix test and lint failures
...
Split test cases.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f27934376d
2017-07-12 11:37:35 -04:00
8658bf36a0
Merge pull request #323 from dnephin/add-code-owners
...
Add a new CODEOWNERS file, and add a few owners
Upstream-commit: bb795aa7af
2017-07-12 13:28:24 +02:00
e4f148de96
Merge pull request #277 from thaJeztah/dont-remove-what-isnt-there
...
Don't attempt to remove unsupported resources on older daemon
Upstream-commit: 87345ed117
2017-07-12 10:43:54 +02:00
316c35cc99
Merge pull request #299 from dnephin/less-verbose-fake-cli
...
Less verbose fake cli
Upstream-commit: fa7687a362
2017-07-12 09:56:43 +02:00
a05235a1e0
Merge pull request #322 from dnephin/pin-tools
...
Pin all tools used in the Dockerfiles
Upstream-commit: 8b451c598f
2017-07-12 08:58:33 +02:00
d73fe10e9e
Update some tests to remove unnecessary buffers.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 42a3800783
2017-07-11 17:52:43 -04:00
b0276ff8b1
Add a new CODEOWNERS file, and add a few owners.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 91a5efd882
2017-07-11 17:40:25 -04:00
b37b45da61
Remove unnecessary use of SetConfigfile
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3da0cbfdd1
2017-07-11 14:49:30 -04:00
1e5fbb03aa
Update FakeCli to remove duplication in tests.
...
Use byte buffers by default, since that is what is done most of the time.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 69b142b52a
2017-07-11 14:49:30 -04:00
152c598ec8
Pin all tools used in the Dockerfiles
...
Also update gometalinter to use the official version. The update
found some new gosimple errors, which are fixed.
Also update the filewatcher script for the latest version of filewatcher.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 102a8f0c9d
2017-07-11 14:23:27 -04:00
07b047e230
login: add a --password-stdin argument
...
This:
* conflicts with --password (naturally)
* conflicts with the absence of --username (both can't be grabbed by the
stdin)
* strips a trailing newline off the password if it exists
Signed-off-by: Tycho Andersen <tycho@tycho.ws >
Upstream-commit: 7d18477bc2
2017-07-11 12:16:29 -06:00
dcefa0bb91
Don't attempt to remove unsupported resources on older daemon
...
When running `docker stack rm <some stack>` against an older daemon,
a warning was printed for "configs" being ignored;
WARNING: ignoring "configs" (requires API version 1.30, but the Docker daemon API version is 1.26)
Given that an old daemon cannot _have_ configs, there should not be
a need to warn, or _attempt_ to remove these resources.
This patch removes the warning, and skips fetching (and removing)
configs.
A check if _secrets_ are supported by the daemon is also added,
given that this would result in an error when attempted against
an older (pre 1.13) daemon.
There is one situation where this could lead to secrets or
configs being left behind; if the client is connecting to a
daemon that _does_ support secrets, configs, but the API version
is overridden using `DOCKER_API_VERSION`, no warning is printed,
and secrets and configs are not attempted to be removed.
Given that `DOCKER_API_VERSION` is regarded a feature for
debugging / "power users", it should be ok to ignore this.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2429f15672
2017-07-11 10:29:03 -07:00
4df758062c
Merge pull request #312 from thaJeztah/remove-unused-prune-functions
...
Remove unused prune functions
Upstream-commit: 6908e58f0f
2017-07-11 12:15:44 +02:00
d29a2e376a
Merge pull request #318 from thaJeztah/pin-vndr
...
pin vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587
Upstream-commit: b7b680590b
2017-07-11 12:14:59 +02:00
2fe1273c48
Merge pull request #321 from albers/remove-completion-service-update--network
...
Remove bash completion for `service update --network`
Upstream-commit: 251eafd637
2017-07-11 12:14:27 +02:00
97978c93db
Remove bash completion for service update --network
...
The `--network` option is only available for `docker service create`.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e7e77b5e65
2017-07-11 11:20:18 +02:00
e54b9b8905
pin vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587
...
This make updating vndr a deliberate action, and
prevents updates to vndr from making the vendor
validation fail in CI.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 008785f5b5
2017-07-10 14:31:57 -07:00
740312d66e
Remove unused prune functions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d8a2972cb1
2017-07-10 13:27:19 -07:00
48a86be4fc
Merge pull request #316 from thaJeztah/revendor-dependencies
...
Revendor dependencies
Upstream-commit: a765218f19
2017-07-10 13:23:17 -07:00
f217147904
Revendor dependencies
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3e3c9d69d8
2017-07-10 10:56:42 -07:00
e7c8bab937
Merge pull request #298 from dnephin/fix-stack-out-stream
...
Fix stack output stream
Upstream-commit: af6c0896f5
2017-07-10 09:23:23 +02:00
3578bb4ff2
Merge pull request #259 from aaronlehmann/service-progress-surface-error
...
progress: Show task error in place of progress bar
Upstream-commit: 7ae9bc141c
2017-07-09 00:04:38 -07:00
b41167fb89
Merge pull request #270 from tych0/warn-only-about-password-on-cli
...
login: print a big warning when using --password
Upstream-commit: c99530b1d2
2017-07-08 16:37:40 -07:00
89b86f4aaf
Merge pull request #308 from ProgVal/patch-1
...
Fix typo (proceed -> precede)
Upstream-commit: 534c3d285b
2017-07-07 13:45:00 -07:00
aa221f747d
Fix typo (proceed -> precede)
...
Signed-off-by: Valentin Lorentz <progval+git@progval.net >
Upstream-commit: 4f3a8aecad
2017-07-07 13:17:15 +02:00
4b7c8d1706
Merge pull request #303 from yastij/fix-SIGSEGV-runContainer
...
fixing SIGSEGV when running containers
Upstream-commit: dfdbdab651
2017-07-06 15:45:38 -07:00
f002184455
progress: Light refactor
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: c9b92a328d
2017-07-06 10:40:35 -07:00
b0f07c55f2
fixing SIGSEGV when running containers
...
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com >
moving the deffering of the close after the error checking
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com >
fixing SIGSEGV when running containers
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com >
Upstream-commit: 45b0e7cf1a
2017-07-06 18:57:36 +02:00
e249ded12b
Merge pull request #211 from ksouf/issue-37-add-tests-on-commands
...
adding network_create tests
Upstream-commit: 1aa82bc7df
2017-07-06 08:59:15 +02:00
e839364f20
Merge pull request #296 from thaJeztah/fix-error-overwrite
...
Fix error variable being overwritten
Upstream-commit: e672589ec0
2017-07-05 19:26:27 -07:00
b9da7abd2e
Merge pull request #19 from seemethere/increment_to_ga
...
Increment RPM changelog to docker-ce 17.06.0-ce
Upstream-commit: d6cdd2cd4edc041e0887b741ae11ae9e925eb055
Component: packaging
2017-07-05 15:59:25 -07:00
8172ee629e
Merge pull request #26 from seemethere/add_operating_instructions
...
Adds operating instructions
Upstream-commit: b970db134960bcb7c18ce7f41667554a4efc8761
Component: packaging
2017-07-05 15:59:06 -07:00
