Commit graph

25295 commits

Author SHA1 Message Date
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
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
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
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
Sebastiaan van Stijn
6b3faf781f Merge pull request #23857 from davidmichaelkarr/patch-1
Update work-with-networks.md: Fix Subnet and Gateway props to match command line
2016-06-23 12:25:02 -07:00
Tõnis Tiigi
487931902c Merge pull request #23790 from tonistiigi/skip-pull
Skip always pulling images on integration tests
2016-06-23 11:47:33 -07:00
Vincent Demeester
18398b2933 Merge pull request #23859 from aboch/vnd
Update check-config.sh, netlink and libnetwork vendoring
2016-06-23 20:34:02 +02:00
Vincent Demeester
4cad55026a Merge pull request #23896 from runcom/f24-contrib
contrib: builder: rpm: add Fedora 24
2016-06-23 20:08:35 +02:00
Vincent Demeester
3c40f22d70 Merge pull request #23899 from orkaa/evalulate-rename
For the lulz! (evalulate -> evaluate)
2016-06-23 19:23:54 +02:00
Aaron Lehmann
c9175a6deb Merge pull request #23862 from LK4D4/fix_unused
all: fix usage of some variables
2016-06-23 10:21:10 -07:00
orkaa
1bdbfa5770 For the lulz! (evalulate -> evaluate)
Signed-off-by: orkaa <orkica@gmail.com>
2016-06-23 16:26:43 +02:00
Antonio Murdaca
0b83f27328 contrib: builder: rpm: add Fedora 24
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-23 12:31:11 +02:00
Vincent Demeester
e3a698fcd0 Merge pull request #23888 from sdurrheimer/zsh-completion-event-load-save
Add zsh completion for 'load' and 'save' image events
2016-06-23 10:13:01 +02:00
Vincent Demeester
28f4a8ca55 Merge pull request #23890 from sdurrheimer/zsh-completion-link-local-ip
Add zsh completion for 'docker {create,run,network connect} --link-lo…
2016-06-23 10:12:05 +02:00
Vincent Demeester
6211570de1 Merge pull request #23891 from sdurrheimer/zsh-completion-run-storage-opt
Add zsh completion for 'docker run --storage-opt size='
2016-06-23 10:11:02 +02:00
Vincent Demeester
29717dd347 Merge pull request #23892 from sdurrheimer/zsh-completion-cpu-shares-c
Re-Add zsh completion for '-c' alias to '--cpu-shares'
2016-06-23 10:09:59 +02:00
Vincent Demeester
9ebc423e16 Merge pull request #23889 from sdurrheimer/zsh-completion-storage-driver-overlay2
Add zsh completion for 'docker daemon --storage-driver (overlay2|vfs)'
2016-06-23 10:08:38 +02:00
Steve Durrheimer
4c23ac0ae5
Re-Add zsh completion for '-c' alias to '--cpu-shares'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-23 08:57:39 +02:00
Steve Durrheimer
857e7d6ae4
Add zsh completion for 'docker run --storage-opt size='
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-23 08:52:42 +02:00
Steve Durrheimer
704d9b6864
Add zsh completion for 'docker {create,run,network connect} --link-local-ip'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-23 08:44:08 +02:00
Steve Durrheimer
8e582a2573
Add zsh completion for 'docker daemon --storage-driver (overlay2|vfs)'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-23 08:35:36 +02:00
Steve Durrheimer
e2f1f699b3
Add zsh completion for 'load' and 'save' image events
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-23 08:29:24 +02:00
Akihiro Suda
cfe16e0d5b update go-md2man to v1.0.5
Due to the issue of go-md2man, a numbered list in `man docker login` was not rendered correctly.
a8f937e113

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-23 01:58:37 +00:00
Tonis Tiigi
c895a76f10 Fix error reporting on executor wait
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-22 18:12:51 -07:00
Tonis Tiigi
5d4401d6d7 Do not show tasks from down nodes as active in ls
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-22 14:49:24 -07:00
Charles Smith
5f219806fc correct output description - only one task is running on manager
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-22 12:41:22 -07:00
Alexander Morozov
138f9538f3 Merge pull request #23776 from Microsoft/ShutdownError
Windows: Prevent logging errors when shutting down an already shut down container
2016-06-22 12:11:00 -07:00
Tõnis Tiigi
506234e3f0 Merge pull request #23829 from LK4D4/cleanup_unused
api,daemon: cleanup some unused stuff
2016-06-22 11:58:57 -07:00
Alexander Morozov
df6630f6a3 Merge pull request #23832 from tonistiigi/unify-swarm-init-update
Unify swarm init and update options
2016-06-22 11:56:07 -07:00
Alexander Morozov
7eae48cd21 Merge pull request #23835 from swernli/loggerfix
Fixing file handle leak for "docker logs"
2016-06-22 11:52:55 -07:00
Alessandro Boch
c355e059cc Add modules for secure overlay network to check-config.sh
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-22 10:51:13 -07:00