Commit Graph

10418 Commits

Author SHA1 Message Date
Arthur Gautier 3e6c69e5a1 Fix SEGFAULT if dns resolv error
Per registry.doRequest, res and client might be nil in case of error
For example, dns resolution errors, /etc/docker/certs.d perms, failed
loading of x509 cert ...
This will make res.StatusCode and res.Body SEGFAULT.

Signed-off-by: Arthur Gautier <baloo@gandi.net>
2014-09-05 13:40:06 +02:00
Sven Dowideit 5fe94f0d91 Use a local copy of jquery so that the docs work in China, and offline too.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-05 11:48:34 +10:00
Victor Vieux b0cff06c97 Merge pull request #7883 from LK4D4/fix_build_race
Fix race between dispatchers.run and toDisk
2014-09-04 17:32:46 -07:00
Sven Dowideit 03fdc7d2c1 Merge pull request #7890 from fredlf/docs-cherry-pick-update-process
Changes to Sven's cherry pick process
2014-09-05 09:58:18 +10:00
Tianon Gravi 068b9ac4d2 Update Travis to also run the test suite
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-09-04 17:20:02 -06:00
Tibor Vass 1a2a4f61ab Merge pull request #7878 from LK4D4/fix_net_for_none
Don't initialize network for 'none' mode
2014-09-04 15:30:03 -07:00
Tianon Gravi d3b5bf5d24 Merge pull request #7763 from jamtur01/kate
Add syntax highlighting file for KDE's "Kate" editor
2014-09-04 15:28:11 -06:00
Fred Lifton b23daef3ec Changes to Sven's cherry pick process
Added content and revised after walk-through

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-09-04 13:32:16 -07:00
James Turnbull f7c0ac9a8b Merge pull request #7873 from jankeromnes/patch-1
Update SSH demo to ubuntu 14.04
2014-09-04 15:45:55 -04:00
Jan Keromnes 98f57d1c39 Update SSH demo to ubuntu 14.04
Signed-off-by: Jan Keromnes <janx@linux.com>
2014-09-04 20:27:41 +02:00
James Turnbull bc26aa7b50 Merge pull request #7876 from nhsiehgit/typofix
small typo. wrapping cut code snippet
2014-09-04 12:37:07 -04:00
Alexandr Morozov f17410da5e Fix race between dispatchers.run and toDisk
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-04 19:43:28 +04:00
Alexandr Morozov ba24820284 Don't initialize network for 'none' mode
Fixes #7837

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-04 09:50:58 +04:00
Sven Dowideit dbe1123607 Merge pull request #7828 from vieux/update_api_docs
Remote api docs for POST /containers/create were out of sync with runconfig/config.go
2014-09-04 13:05:06 +10:00
Sven Dowideit e1907bafb7 Merge pull request #7858 from somaopensource/typo-fix
Dockerfile documentation typo and content fix
2014-09-04 13:03:04 +10:00
Michael Crosby d9fc61066d Merge pull request #7864 from unclejack/fix_panic_registry_session
registry/session: fix panic in GetRemoteImageLayer
2014-09-03 18:17:03 -07:00
Nathan Hsieh adc9a14db4 small typo. fixed broken code snippet
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com> (github: nhsiehgit)
2014-09-03 17:53:45 -07:00
Victor Vieux 68c256cd40 Merge pull request #7875 from tiborvass/fix-integration-panic
Fix panic in integration-cli
2014-09-03 17:33:04 -07:00
Tibor Vass 39310448da handle empty envvars for DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in daemon test framework
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-03 17:14:19 -07:00
Tibor Vass defe01daf8 fix race in daemon test framework
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-03 17:14:19 -07:00
Victor Vieux affef9e785 Merge pull request #7865 from cure/master
fix typos in error messages
2014-09-03 16:03:20 -07:00
Tibor Vass 782cde2c0f Merge pull request #7818 from thomasleveil/completion-docker-build
Add --force-rm to docker build command completion
2014-09-03 14:44:13 -07:00
James Turnbull a3326c3469 Merge pull request #7850 from fredlf/add_cherrypick_process
Add cherrypick process
2014-09-03 17:33:49 -04:00
Vincent Bernat dc2eab2cf4 zsh: update zsh completion for docker command
zsh completion is updated with the content of
felixr/docker-zsh-completion.

The major change since the last merge is the removal of use of
sed/awk. This should help a lot OSX users who previously had to install
gawk and gsed.

Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im> (github: vincentbernat)
2014-09-03 22:30:11 +02:00
Ward Vandewege a447894946 fix typos in error messages
Signed-off-by: Ward Vandewege <ward@jhvc.com> (github: cure)
2014-09-03 13:12:10 -04:00
Arthur Gautier 2a7770a712 The correct option for go test is -test.run not -run 2014-09-03 19:06:25 +02:00
unclejack 6ba5d67a51 docker build: pull just latest if tag uspecified
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-03 18:32:47 +03:00
SvenDowideit 82b0c3e59c add a little documentation for docker pull
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-09-03 18:32:41 +03:00
unclejack 9c08364a41 add --all-tags to pull & pull latest by default
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-03 18:03:14 +03:00
unclejack 9c413e3e6f registry/session: fix panic in GetRemoteImageLayer
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-03 17:26:56 +03:00
Thomas LÉVEIL 40f0bf7564 Add --force-rm to docker build command completion
Signed-off-by: Thomas LEVEIL <thomasleveil@gmail.com>
2014-09-03 14:26:16 +02:00
Oh Jinkyun 476f1df36f Dockerfile documentation typo and content fix
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com>
2014-09-03 19:28:01 +09:00
Alexandr Morozov 58dc474e65 Merge pull request #7542 from unclejack/refactor_archive_buffering
Refactor archive buffering
2014-09-03 12:39:14 +04:00
unclejack 84d76e556b archive: use pooled bufio readers and writers
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-03 11:37:03 +03:00
unclejack 2d2016b81b pkg/pool: add pools for bufio readers & writers
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-03 11:36:39 +03:00
unclejack bd130e72a0 pkg/ioutils: add ReaderErrWrapper to readers
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-03 11:36:21 +03:00
unclejack c93b9e81c0 pkg/ioutils: add NewBufReaderWithDrainbufAndBuffer
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-03 11:36:21 +03:00
unclejack 7b6f34057c pkg/ioutils: add WriteCloserWrapper
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-03 11:36:21 +03:00
unclejack 76212635b5 move some io related utils to pkg/ioutils
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-03 11:36:21 +03:00
unclejack 2da75f7079 Merge pull request #7315 from vieux/add_pb
add progress bar to ADD
2014-09-03 11:00:31 +03:00
Tibor Vass 426fbee810 Merge pull request #7800 from djbk/master
Cleanup: Typo in job.go
2014-09-02 17:47:18 -07:00
Fred Lifton 23cf3f7407 Adding Docs Deploy process to Docs ReadMe
Additions and revisions to Sven's cherry-pick process doc.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-09-02 17:44:36 -07:00
Byung Kang cc84ec3f61 Cleanup: Typo in job.go
Signed-off-by: Byung Kang <byungk91@gmail.com>
2014-09-02 19:37:14 -05:00
Victor Vieux 4e40d09a2b Add a progress bar for ADD <url> <dst>
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-09-03 00:17:08 +00:00
Jessie Frazelle f74b901da6 Merge pull request #7839 from LK4D4/embed_state_to_container
Use State as embedded to Container
2014-09-02 15:18:32 -07:00
Alexandr Morozov e0339d4b88
Use State as embedded to Container
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-03 00:01:11 +04:00
unclejack 6db078dea7 Merge pull request #7191 from tiborvass/test-daemon
Add Daemon restart test along with Daemon utils
2014-09-02 22:40:23 +03:00
Victor Vieux 6eef7de396 Merge pull request #7842 from unclejack/build_delete_context
clean up context on build completion & add test
2014-09-02 12:19:47 -07:00
Tibor Vass ca24e91408 Merge pull request #7765 from erikh/test_unit_testflags
hack/make: fix test-unit target to propogate TESTFLAGS properly
2014-09-02 12:18:40 -07:00
Tibor Vass a9971a89cc Add TestDaemonRestartWithRunningContainersPorts
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-09-02 12:13:21 -07:00