c2eba39c13
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-07-14 20:03:09 +00: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
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
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
c966fe9e08
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-07-04 05:59:51 +00:00
ef3fca8458
Merge component 'engine' from git@github.com:moby/moby master
2017-07-03 19:12:09 +00:00
d49a090a5e
Merge component 'cli' from git@github.com:docker/cli master
2017-07-03 18:51:34 +00:00
a2a898edc8
Merge pull request #33899 from cyphar/make-dynbinary
...
make: add dynbinary target
Upstream-commit: 8bc681262f970b243cb5e9796c47ecd8d6b6aabf
Component: engine
2017-07-03 17:50:20 +02:00
b0ff0a2e4a
Merge pull request #33888 from thaJeztah/enable-version-negotiation
...
Always perform version-negotiation
Upstream-commit: 75a034621d715bf01069cc3f7bab0cce85fa744c
Component: engine
2017-07-03 17:46:35 +02:00
955a71e569
Merge pull request #33926 from coolljt0725/fix_wrong_file_mode
...
Fix wrong filemode for rotate log files
Upstream-commit: d061ad4a1b3b029e4afa042c1eaf707037562e8c
Component: engine
2017-07-03 17:45:14 +02:00
bd2899d4b2
Merge pull request #33908 from thaJeztah/carry-33883-ignore-nonexistent-containers
...
[carry 33883] daemon: Ignore nonexistent containers when listing containers
Upstream-commit: cab50de4d682890187b48984e0c81b98cb69ed4f
Component: engine
2017-07-03 17:06:54 +02:00
c914e1a6cd
Merge pull request #213 from dnephin/improve-swarm-ca-cmd
...
Refactor and UI changes to `swarm ca` command
Upstream-commit: 85b41c3e71
2017-07-03 17:02:45 +02:00
0257839dba
Merge pull request #33853 from vieux/report-2017-06-26
...
Moby Dev Report 2017 06 26
Upstream-commit: 714c226b431c73efa43373fb7a284408b709c80f
Component: engine
2017-07-03 11:18:11 +02:00
3a59ac4d9f
Fix wrong filemode for rotate log files
...
the filemode should be 0640 but not 06400
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 96ea8eaa1592856e0829c3465e64f93911d3e389
Component: engine
2017-07-03 03:49:22 -04:00
9787d41c94
Remove comment about forked golang.org/x/net
...
This dependency was temporarily forked, but
the fork was removed in db37a86d37431a1d82505cf6adc91a5d91dad146.
This patch removes the comment
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: fe877c2b959b60d953ad4b2d3eeda377add575a5
Component: engine
2017-07-02 00:19:15 -07:00
c5ade3e304
daemon: Ignore nonexistent containers when listing containers
...
The name/ID relationships are maintained separately from the memdb and
can be out of sync from any particular memdb snapshot. If a container
does not exist in the memdb, we must accept this as normal and not fail
the listing. This is consistent with what the code used to do before
memdb was introduced.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d257a63fb6a2ad0c2369981914544add389917bf
Component: engine
2017-06-30 15:19:47 -07:00
27d204d888
make: add dynbinary target
...
Recently, it's become necessary to build dynbinaries on certain
distributions, so make it easier for users to build dynbinaries. It
looks like this was just an oversight when we added dynbinary builds.
Signed-off-by: Aleksa Sarai <asarai@suse.de >
Upstream-commit: c81255c9c0314b81ab27f6afd7646cdd259e6495
Component: engine
2017-07-01 04:54:57 +10:00
8e86b3a04f
Merge pull request #33875 from tmp6154/master
...
Change order of arguments in assertion to be more logical
Upstream-commit: 87df0e533b619c088091fd1e2310e92bb9a24822
Component: engine
2017-06-30 14:46:11 -04:00
6a2cd2eda7
Merge pull request #33890 from ripcurld0/nesting_fix
...
Refactor MountPoint Setup function in volume.go
Upstream-commit: 2b20737778ff27b6b08b30912378931271c14eb8
Component: engine
2017-06-30 14:40:50 -04:00
96548baff2
Merge pull request #33882 from aaronlehmann/memdb-no-container
...
container: Handle failed memdb lookups
Upstream-commit: 18d874a20fccbd017e91cfaad31861b0953e22fa
Component: engine
2017-06-30 14:31:10 -04:00
3bd733bca1
Merge pull request #273 from adshmh/add-unit-tests-to-task-package
...
add unit tests to task package
Upstream-commit: 379b762495
2017-06-30 11:41:24 -04:00
cccb3a2108
add dev report 2017-06-26
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 8b0384fd8918e82459aab037d50bca6394bbf781
Component: engine
2017-06-30 17:19:40 +02:00
ab5c937cf4
Merge pull request #33824 from ijc/build-iidfile-with-squash
...
builder: Emit a BuildResult after squashing.
Upstream-commit: b8766fe793c18149e167b8f9819352a3bfcb0514
Component: engine
2017-06-30 16:42:23 +02:00
d97f0f6543
Merge pull request #268 from albers/completion-swarm-ca
...
Add bash completion for `swarm ca`
Upstream-commit: afcc75ddfe
2017-06-30 11:42:28 +02:00
5cf169cc6a
Merge pull request #269 from albers/completion-swarm-init--data-path-addr
...
Fix bash completion for `swarm init|join --data-path-addr`
Upstream-commit: 9689ccab1b
2017-06-30 10:29:35 +02:00
88fc3881d6
Merge pull request #250 from albers/completion-service-create--detach
...
Add bash completion for `service create --detach`
Upstream-commit: b306817220
2017-06-30 01:16:19 -07:00
fb07a8e807
Merge pull request #256 from albers/completion-service-update-order
...
Add bash completion for `service create|update (update|rollback)-order`
Upstream-commit: c726ccaf6c
2017-06-30 01:12:57 -07:00
67050e7a6f
Merge pull request #257 from albers/completion-service--network-add
...
Add bash completion for `service create|update --network-(add|rm)`
Upstream-commit: 321c692868
2017-06-30 01:11:22 -07:00
8d232fdb68
Refactor MountPoint Setup function in volume.go
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: fb8b27cd41c92c9a739be70dee11f6e6ffffafdf
Component: engine
2017-06-30 11:09:49 +03:00
1e38251e9a
Merge pull request #251 from albers/completion-plugin-events
...
Add bash completion for plugin events
Upstream-commit: d1ccfcaf2a
2017-06-30 01:02:53 -07:00
72ce4394de
Merge pull request #254 from albers/completion-system-prune--volumes
...
Add bash completion for `system prune --volumes`
Upstream-commit: 495ab9b3e9
2017-06-30 01:01:14 -07:00
46544e3ed0
Merge pull request #249 from albers/completion-fix-network-create--internal
...
Fix bash completion for `network create --internal`
Upstream-commit: b45c7d614e
2017-06-30 00:11:38 -07:00
b7f79e8cec
Merge pull request #247 from albers/completion-service--entrypoint
...
Add bash completion for `service create|update --entrypoint`
Upstream-commit: 1c4d070cf5
2017-06-30 00:09:20 -07:00
57f1273555
Merge pull request #239 from albers/completion-network-create--ingress
...
Add bash completion for `docker network create --ingress`
Upstream-commit: 993b78d276
2017-06-30 00:05:44 -07:00
1a311235ba
Always perform version-negotiation
...
If a client is initialized without a specific
version set, version negotiation would not be
functional.
This patch changes the behavior to always
perform version negotation (if called), in
which case the "current" (maximum supported
API version) is used as a default.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5975dc4b4b8a6fa2e0edd1f1b113e7f66dad732b
Component: engine
2017-06-29 22:24:49 -07:00
5edabea811
Merge pull request #233 from dnephin/build-stdin-with-compress
...
Build stdin with compress
Upstream-commit: 0b050a599f
2017-06-29 18:38:55 -07:00
60185c5eb3
container: Handle failed memdb lookups
...
If a container doesn't exist in the memdb, First will return nil, not an
error. This should be checked for before using the result.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: c26b0cdfd1a026af88fcfbed9d3c3acdd6d171a0
Component: engine
2017-06-29 16:33:30 -07:00
04259ca4ac
add unit tests to task package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 244e28f41f
2017-06-29 17:57:31 -04:00
05c34f9c1a
Refactor caCommand
...
Split out a swarmCAOptions struct for options that are shared between
the ca and update commands.
Change the 'no trust root' message to an error.
Add some unit tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 81e9837859
2017-06-29 17:57:06 -04:00
129c66c19b
Some builder docs improvements
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 29b419eed5
2017-06-29 14:20:16 -07:00
2f46157f44
Merge pull request #33873 from lixiaobing1/masterissue
...
update url for issue
Upstream-commit: 82390ebf32c3e48d80b862ffe46d4160aa65b728
Component: engine
2017-06-29 13:48:19 -07:00
e0679f41e0
Merge pull request #33827 from cpuguy83/return_ping_data_if_available
...
Set ping version even on error
Upstream-commit: 654bb6368b838bc619a5d612a39abb385fbd45c3
Component: engine
2017-06-29 12:27:23 -07:00
27d5d2149c
Compress after rewriting the archive.
...
Write a test showing compress failure.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a04aa8fe28
2017-06-29 13:18:10 -04:00
d8218cc6ef
Merge pull request #227 from dnephin/expose-config
...
expose config credentials without needing the Cli
Upstream-commit: 74af31be7f
2017-06-29 19:11:37 +02:00
85421deb82
Set ping version even on error
...
In some cases a server may return an error on the ping response but
still provide version details. The client should use these values when
available.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 27ef09a46ffeb8ba42548de937b68351009f30ea
Component: engine
2017-06-29 12:42:14 -04:00
c54c912237
Merge pull request #238 from vdemeester/update-go-connections
...
Update go-connections dependency
Upstream-commit: 8de604c857
2017-06-29 18:04:27 +02:00
38c47208e6
Merge pull request #255 from albers/system-prune-volume-warning
...
system prune: only warn for volumes if --volumes is given
Upstream-commit: 64486d7820
2017-06-29 08:50:16 -07:00
4815e9227a
Fix bash completion for swarm init|join --data-path-addr
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: fa4dc8820a
2017-06-29 16:45:18 +02:00
