beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
25326 commits 14 branches 412 tags 338 MiB
Commit graph

25326 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Goff
e2a26744f9 Merge pull request #23697 from dongluochen/blockServiceModeChange 
Do not allow service mode change
 2016-06-27 10:53:53 -04:00
Brian Goff
982fc5edca Merge pull request #23967 from duglin/removeLine 
Remove blank line on daemon output when there are no containers to load
 2016-06-27 09:48:41 -04:00
Vincent Demeester
1cfd37f432 Merge pull request #23801 from inercia/fix_docker_cli_by_digest 
Make sure some integration tests check for the right return code
 2016-06-27 15:37:59 +02:00
Brian Goff
c83a97f62f Merge pull request #23982 from allencloud/uppercase-output-in-node-inspect 
uppercase output in node inspect to keep consistency
 2016-06-27 09:24:36 -04:00
allencloud
89582e1a34 uppercase output in node inspect to keep consistency 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-06-27 18:29:27 +08:00
Alvaro Saurin
b5f51e5281 Change the comments in TestPullFailsWithAlteredLayer and TestPullFailsWithAlteredLayer 
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com>
 2016-06-27 11:06:32 +02:00
Sven Dowideit
1d2adbdd52 Merge pull request #23743 from alxempirical/alxempirical-20160618-clarify-role-of-dockerhost 
Clarify the role of `dockerhost` in the apt-cacher-ng example.
 2016-06-27 11:42:56 +10:00
Sven Dowideit
96b0323cf0 Merge pull request #23842 from tjanez/docs-systemd-default-target 
Use 'default.target' in systemd unit file example
 2016-06-27 11:42:05 +10:00
Doug Davis
478dd721ab Remove blank line on daemon output when there are no containers to load 
Its a minor thing but the daemon's output looks like this when there are
no containers to load:
```
INFO[0001] Loading containers: start.

INFO[0001] Loading containers: done.
```
That blank line (or more correctly, the \n) is unnecessary when
there are no containers to load since there is no `.` printed

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-06-26 10:51:34 -07:00
Brian Goff
d4bff5e3aa Merge pull request #23944 from tonistiigi/disable-iptables 
Disable iptables in swarm test daemons
 2016-06-25 20:22:59 -04:00
Sebastiaan van Stijn
5c33d13cd8 Merge pull request #23956 from vdemeester/docs-dsb-to-dab 
Update experimental docs dsb -> dab
 2016-06-25 10:20:00 -07:00
Vincent Demeester
8af760c910
Update experimental docs dsb -> dab 
Fixing bundle extension in experimental documentation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-25 19:08:03 +02:00
Vincent Demeester
58f1ae1641 Merge pull request #23945 from aanand/update-bundle-extension 
Update bundle extension
 2016-06-25 17:00:33 +02:00
Vincent Demeester
9ed0feece8 Merge pull request #23939 from vdemeester/rename-same-no-lock 
No need for container.Lock if rename same name
 2016-06-25 14:56:20 +02:00
Vincent Demeester
eae254d98b Merge pull request #23942 from aaronlehmann/sanbox 
Fix "sanbox" typos
 2016-06-25 11:27:46 +02:00
Alexander Morozov
b2ba44b11d Merge pull request #23934 from cpuguy83/23862_fix_bind_opts 
Fix panic due to nil bind options
 2016-06-24 16:17:38 -07:00
Tonis Tiigi
caaf92f7b4 Disable iptables in swarm test daemons 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-24 15:47:37 -07:00
Sebastiaan van Stijn
e5a8a7747e Merge pull request #23281 from yongtang/23211-spf13-cobra-update 
Use spf13/cobra for docker update
 2016-06-24 14:31:53 -07:00
Brian Goff
7ff546467d Merge pull request #23940 from allencloud/fix-err-msg 
fix error message and typos in swarm cluster
 2016-06-24 16:57:01 -04:00
Brian Goff
824290a37e Merge pull request #23935 from LK4D4/fix_net_create_use 
cli: fix network create usage
 2016-06-24 16:55:12 -04:00
Brian Goff
caba54396c Merge pull request #23943 from aaronlehmann/task-updates-warning 
Remove log warning on task update
 2016-06-24 16:43:01 -04:00
Aanand Prasad
61e2d4240b Update bundle extension 
It's now .dab, for Distributed Application Bundle

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-06-24 12:32:35 -07:00
allencloud
39bc10c36d fix error message and typos in swarm cluster 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-06-25 03:10:18 +08:00
Aaron Lehmann
39c93cfb47 Remove log warning on task update 
This warning appears in the course of normal use of swarm mode. Since
it's meant more as an internal TODO than something which should be
exposed to a user, remove the log message.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-06-24 12:07:47 -07:00
Aaron Lehmann
fa04558ac1 Fix "sanbox" typos 
Correcting "sanbox" to "sandbox".

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-06-24 12:04:26 -07:00
Aaron Lehmann
e8ec19bd87 Merge pull request #23914 from tonistiigi/upadate-manager-error-message 
Add better error messages for unavailable swarm commands
 2016-06-24 12:02:34 -07:00
Sebastiaan van Stijn
b73b303b1c Merge pull request #23933 from yp-engineering/service-log-typo 
Fixing typo on service log output.
 2016-06-24 11:56:31 -07:00
Tõnis Tiigi
39211d113b Merge pull request #23872 from sfsmithcha/fix_scale_service_output 
correct output description - only one task is running on manager
 2016-06-24 11:04:28 -07:00
Vincent Demeester
7e1ec8d2bd
No need for container.Lock if rename same name 
During the renaming of a container, no need to call `container.Lock()`
if `oldName == newName`.

This is a follow-up from #23360 (commit 88d1ee6c11)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-24 19:55:48 +02:00
Vincent Demeester
88d1ee6c11 Merge pull request #23360 from sainath14/rename_error 
docker rename fix to address the issue of renaming with the same name
 2016-06-24 19:54:09 +02:00
Vincent Demeester
296b5c761f Merge pull request #23918 from LK4D4/avoid_copy 
pkg/pools: avoid copy of sync.Pool
 2016-06-24 19:35:43 +02:00
Vincent Demeester
23696e8265 Merge pull request #23921 from tonistiigi/test-timeouts 
Increase test timeouts for node state changes
 2016-06-24 19:21:56 +02:00
Tonis Tiigi
803733120a Add better error messages for unavailable swarm commands 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-24 10:14:57 -07:00
Alexander Morozov
159e7341ad cli: fix network create usage 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-06-24 09:32:39 -07:00
Brian Goff
4c2e1a9cb0 Fix panic due to nil bind options 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-06-24 11:57:17 -04:00
Brian Goff
e82dcf1c6d Merge pull request #23881 from tonistiigi/exec-wait 
Fix error reporting on executor wait
 2016-06-24 11:18:49 -04:00
Brian Goff
4d7e08d675 Merge pull request #23733 from tkopczynski/20784-builder-dockerfile-dispatchers 
Builder/dockerfile/dispatchers.go unit tests
 2016-06-24 11:10:16 -04:00
Brian Goff
f6326d3076 Merge pull request #23802 from inercia/fix_docker_cli_run_test 
Make sure we compare string with the same capitalization
 2016-06-24 10:27:29 -04:00
Vincent Demeester
2fe294c16a Merge pull request #23883 from AkihiroSuda/md2man105 
update go-md2man to v1.0.5
 2016-06-24 10:58:25 +02:00
Vincent Demeester
cf54dfba34 Merge pull request #23875 from tonistiigi/task-node-down 
Do not show tasks from down nodes as active in ls
 2016-06-24 10:07:25 +02:00
Tibor Vass
bf08aae852 Merge pull request #23919 from Microsoft/jjh/prefix 
Windows: Ensure frozen cope with prefix
 2016-06-23 19:46:55 -07:00
Tibor Vass
45f76db06d Merge pull request #23824 from mlaventure/fix-apt-repo-components-fields 
Fix the value of the Components value in apt {In,}Release files
 2016-06-23 17:54:13 -07:00
Tonis Tiigi
2e5da44341 Increase test timeouts for node state changes 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-23 17:30:42 -07:00
John Howard
b820ead426 Windows: Ensure frozen cope with prefix 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-06-23 16:39:16 -07:00
Alexander Morozov
ba3af336eb pkg/pools: avoid copy of sync.Pool 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-06-23 16:09:13 -07:00
Vincent Demeester
37fe4bdb59 Merge pull request #23912 from dmcgowan/fix-overlay2-whiteout-exclusion 
Fix overlay2 ignoring whiteout files
 2016-06-24 01:06:38 +02:00
Adam Avilla
7cc6fe5758 Fixing typo on service log output. 
Signed-off-by: Adam Avilla <aavilla@yp.com>
 2016-06-23 14:54:40 -07:00
Derek McGowan
bd13c53f8d Fix overlay2 ignoring whiteout files 
Currently when overlay creates a whiteout file then the overlay2 layer is archived,
the correct tar header will be created for the whiteout file, but the tar logic will then attempt to open the file causing a failure.
When tar encounters such failures the file is skipped and excluded for the archive, causing the whiteout to be ignored.
By skipping the copy of empty files, no open attempt will be made on whiteout files.

Fixes #23863

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-06-23 13:34:38 -07:00
Doug Davis
86d5c7e759 Merge pull request #23760 from SerhatG/docker_doc_cmd_shell_comment 
Docker reference error CMD with ENV variables
 2016-06-23 13:34:14 -07:00
Sebastiaan van Stijn
563973a183 Merge pull request #23853 from docker/linkchecker-updates 
Removing some url links that can be resolved using src markdown links
 2016-06-23 12:34:45 -07:00