Commit Graph
9190 Commits
Author SHA1 Message Date
Michael Crosby 2fbe59b1d9 Use argv0 as reexec implementation for dockerinit
This changes the way the exec drivers work by not specifing a -driver
flag on reexec.  For each of the exec  drivers they register their own
functions that will be matched aginst the argv 0 on exec and called if
they match.

This also allows any functionality to be added to docker so that the
binary can be reexec'd and any type of function can be called.  I moved
the flag parsing on docker exec to the specific initializers so that the
implementations do not bleed into one another.  This also allows for
more flexability within reexec initializers to specify their own flags
and options.

Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 73210671764fc3de133a627205582e069e1ff43d
Component: engine
2014-08-11 11:47:21 -07:00
Tibor Vass 349e2e4036 Merge pull request #7502 from LK4D4/catch_error_console
Catch error on console creation
Upstream-commit: e033425f0bcf58f1409e7a10a408c778f1c754e4
Component: engine
2014-08-11 12:13:53 -04:00
Tibor Vass e0e3ff094a Merge pull request #7509 from LK4D4/fix_http_handler_error_log
Fix log message on http handler error
Upstream-commit: 5ffbc8dc825e374e5ccfcdebf1b4df20a97c45db
Component: engine
2014-08-11 12:12:33 -04:00
Tibor Vass 6daa957315 Merge pull request #7499 from LK4D4/fix_events_error
Fix error message on logging events
Upstream-commit: e94d77291063b13066af079ff0036eabb80d379b
Component: engine
2014-08-11 12:10:30 -04:00
Tibor Vass 739ca06dd3 Merge pull request #7520 from LK4D4/more_events_test
More events test
Upstream-commit: a9ff2fdfac1986515eecb43bb89a6ca8c0a45ec8
Component: engine
2014-08-11 12:09:11 -04:00
unclejack 4b0847a35d Merge pull request #6301 from rail44/feature-load-only-not-exist-image
Use only unavailable image when load from Tarball
Upstream-commit: f4f1e4db708193edeea996c46bd8ff6e434e9eba
Component: engine
2014-08-11 11:28:52 +03:00
Alexandr Morozov 08affc52f2 Test on untag and delete events
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 44842ea3d86268dbe5279b2d5bd47b6c6a4a1b44
Component: engine
2014-08-11 11:39:47 +04:00
Alexandr Morozov 6b96f468a4 Test on container events
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 17ab516fdeb53fe59fbca1b832429d846d8f571b
Component: engine
2014-08-11 10:42:55 +04:00
Solomon Hykes 55f81c6e0a Merge pull request #7496 from shykes/cleanup-push-pull
Cleanup: move "pull" and "push" to graph/pull.go and graph/push.go
Upstream-commit: b74e507245a63b20bdc6af36ed0a48d705a94f19
Component: engine
2014-08-10 23:29:28 -07:00
James Turnbull 3182bc2e13 Merge pull request #7489 from duglin/7281
fix for issue 7281
Upstream-commit: 9fa4bea03b13923c399e9244808a83d007f93662
Component: engine
2014-08-10 13:27:21 -04:00
James Turnbull 9c2865f2e8 Merge pull request #7498 from ostezer/fix-builds-errors
Docs: Fix builds.md line-length + minor typo issues
Upstream-commit: dfd6fcb5489f890dcd62a13f09d2a6bb497b5bd4
Component: engine
2014-08-10 13:26:16 -04:00
James Turnbull e7a62680bf Merge pull request #7501 from wyc/patch-1
Update gentoolinux.md
Upstream-commit: 7b13212076d0161ce7a81c56f6cc8ef54e6142ff
Component: engine
2014-08-10 13:20:14 -04:00
James Turnbull 58ea0dfc63 Merge pull request #7514 from phemmer/cli_cmd_prefix_fix
fix command output examples in cli documentation
Upstream-commit: aa3bc6559b2784f832ad86b039a993cac6e9c63d
Component: engine
2014-08-10 13:18:50 -04:00
Patrick Hemmer 6959cc9071 fix command output examples in cli documentation
f87a97f accidentally added a few too many `$` line prefixes

Docker-DCO-1.1-Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com> (github: phemmer)
Upstream-commit: d613f1121751dd76939b9089d60729e6ed6140a6
Component: engine
2014-08-10 12:47:46 -04:00
Alexandr Morozov bb524e6e8b Fix log message on http handler error
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: e9aa6489a640c6fb2d51bd07e481b9d6ab704290
Component: engine
2014-08-10 13:30:22 +04:00
Alexandr Morozov 10183d52c2 Catch error on console creation
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 93f6cf035156d3b17cbf61f1a61926c068bd8e92
Component: engine
2014-08-09 22:10:44 +04:00
wyc eacd91aa24 Update gentoolinux.md
Upstream-commit: 6ba1949e6aed4b8a6d81b9ad4a43a4743f39ac32
Component: engine
2014-08-09 14:00:29 -04:00
LK4D4 6fa220da5d Fix error message on logging events
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 7afc49b40bd3a2c86a807a5ab4c722b12932d856
Component: engine
2014-08-09 18:45:38 +04:00
Doug Davis 811bdfdcea fix for issue 7281
add missing comma per O.S. Tezer's commment

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 55dc4f2b94f68e9e1b4e73b1f21cf5151f86e8f8
Component: engine
2014-08-09 08:11:59 -04:00
O.S. Tezer 31a920688e Docs: Fix builds.md line-length + minor typo issues
This PR proposes to fix some already existing (i.e., older)
line-length & line-alignment issues and the ones recently
included/merged with the PR #7406
(https://github.com/docker/docker/pull/7406).

It also proposes to fix a couple minor typography mistakes
(i.e., spelling of GitHub and Service Hooks (headers))

This PR does *not* propose any content changes.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 8b3f2381d0a842bc39c34c39647722fc783d968c
Component: engine
2014-08-09 14:55:47 +03:00
Hollie Teal 73581056c0 Merge pull request #7406 from hollietealok/docs_add
Added "Github Submodules" section to Automated Builds doc.
Upstream-commit: 2dc21af70b764cb7f3984b576fdfa049cad87c6c
Component: engine
2014-08-08 09:40:42 -07:00
James Turnbull a4dc156e24 Merge pull request #7465 from flavio/update-opensuse-doc
Updated openSUSE's installation instructions
Upstream-commit: fb650d1e6d938240c3e2058e3d8dc9eb75128435
Component: engine
2014-08-08 11:28:27 -04:00
Tibor Vass 974366f036 Merge pull request #7479 from shykes/cleanup-server-info
Cleanup: move "info" to daemon/info.go
Upstream-commit: 7dbab337dd9f555a8c2653a8a3690496d70eb982
Component: engine
2014-08-08 09:34:14 -04:00
Satoshi Amemiya d6d8f8ffe0 Use only unavailable image when load from Tarball
Docker-DCO-1.1-Signed-off-by: Satoshi Amemiya <satoshi_amemiya@voyagegroup.com> (github: rail44)
Upstream-commit: a34dd216119bd343eb4a1f68ad209816d7a3f4c9
Component: engine
2014-08-08 20:30:38 +09:00
Flavio Castelli f9e96cf7d4 Updated openSUSE's installation instructions
Cover network configuration and reference the official openSUSE image
inside of the examples.

Docker-DCO-1.1-Signed-off-by: Flavio Castelli <fcastelli@suse.com> (github: flavio)
Upstream-commit: 90e97960fa2282189f16b44a8699b3c6ec12e520
Component: engine
2014-08-08 12:36:20 +02:00
Solomon Hykes 1e2878c9bb Move "pull" and "push" to graph/pull.go and graph/push.go
This is part of the ongoing effort to remove the deprecated server/
package, and generally cleanup and simplify the codebase.

Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 6856a6b110caa463a06cae456fc53e93c6adf9d1
Component: engine
2014-08-08 07:25:09 +00:00
James Turnbull a345fa1cd7 Merge pull request #7278 from Toebez/patch-1
Update nodejs_web_app.md
Upstream-commit: 33d6b20c133348fed0d803fbe350b5a663974345
Component: engine
2014-08-07 23:16:37 -04:00
Solomon Hykes 9a5247f7ee Move "info" to daemon/info.go
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 94715e8e643f0bc9aa57841b346f5196f75f0dc0
Component: engine
2014-08-08 03:01:55 +00:00
Sven Dowideit 7b0cf887d4 Merge pull request #7460 from suzaku/fix_docs
Make it clear that JSON array format should be used if CMD is used as default arguments
Upstream-commit: 0ca010695cc504c1a27cfb939e2580e0515caec1
Component: engine
2014-08-08 12:10:01 +10:00
Solomon Hykes 1b47516d28 Merge pull request #7458 from jamtur01/cg
Update CONTRIBUTING.md
Upstream-commit: 09ad385f64b8af06acab61828ac19ead6bd64222
Component: engine
2014-08-07 18:45:51 -07:00
Tianon Gravi f57326ceac Merge pull request #7476 from tianon/sysvinit-status-of-proc
Fix several minor issues with Debian sysvinit script
Upstream-commit: 2767509894e52f7ff28bdd95ccc7737eb6779a1a
Component: engine
2014-08-07 19:30:42 -06:00
Michael Crosby 722d8e53b5 Merge pull request #7374 from cpuguy83/revert_rm_f_deprecation
Revert --stop/--kill and use SIGKILL instead
Upstream-commit: 414ccee23a25df258f9496e721dbfb6f1773ea9a
Component: engine
2014-08-07 16:47:25 -07:00
Michael Crosby c29fd30ad7 Merge pull request #7453 from shykes/new-subsystem-maintainers
Add maintainers to daemon/ and graph/
Upstream-commit: 5d9cfde0df1453ccc66c98cabe42dd640fdb79c2
Component: engine
2014-08-07 16:43:41 -07:00
Tianon Gravi b1b3c2f243 Fix several minor issues with Debian sysvinit script
- add `set -e` to make failing commands bail the script
- remove trailing `exit 0` which is just extraneous anyhow
- adjust `status_of_proc` options to pass in `$DOCKER_DESC` so we get consistently styled messages like `Docker is running` or `Docker is not running` or `could not access PID file for Docker`

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 478fdaf93353c70a26c0043dadb650fd2f101c40
Component: engine
2014-08-07 16:45:22 -06:00
Tibor Vass cf2dcc43fc Merge pull request #7473 from tianon/pwaller-authors
Update .mailmap with a few more addresses
Upstream-commit: 860ab469cc267097e243c634fdb59f7444eefea1
Component: engine
2014-08-07 18:26:49 -04:00
unclejack 081e88cd1a Merge pull request #7304 from unclejack/refactor_build_tests
integration cli: minor refactor of the build tests
Upstream-commit: b36f6308176ccb44d93704388514fa0041a8584e
Component: engine
2014-08-08 01:24:51 +03:00
Brian Goff a79d7ec92b Revert rm -f deprecation use SIGKILL instead
`rm -f` was originally deprecated in favor of `rm --stop/--kill` since `rm
-f` was sending SIGTERM and potentially very slow.
Instead this will bring back `rm -f` but use SIGKILL isntead

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 95f86da641dfec9b3db88e0f0a8457685361a871
Component: engine
2014-08-07 18:20:43 -04:00
Michael Crosby 80a9f6e508 Merge pull request #7405 from LK4D4/indicate_run_volume_test_pass
Print about "copy volume content" test passing
Upstream-commit: 01022a305d7b822ff9740dd0ce992064bffbd4d8
Component: engine
2014-08-07 15:09:41 -07:00
Michael Crosby bdc2cfec82 Merge pull request #7329 from erikh/move_broadcastwriter
Cleanup: utils/broadcastwriter -> pkg/broadcastwriter
Upstream-commit: bc9f5cdeb5c000de5be291a5628d6eb99c1ab91d
Component: engine
2014-08-07 14:51:42 -07:00
Michael Crosby 22832ff041 Graphtest is ok to compile normally
The graphtest package is only imported in the test files of other
packages therefore we do not leak testing flags.

Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: b386bce1f1bc92584282cc3f6656878c05d75272
Component: engine
2014-08-07 14:33:09 -07:00
Tianon Gravi 024c2cf99d Regenerate AUTHORS one more time
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 7a34f1343372b0712155087a9a5f447b59b60084
Component: engine
2014-08-07 15:32:11 -06:00
Peter Waller 56a4d87cf4 Add a few canonicalized author names
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: f8f36ff320d5b14a5fb61ab3fec0b1e7ef1e8aa6
Component: engine
2014-08-07 15:32:11 -06:00
Peter Waller ab4c9735de Change Peter Waller's canonical e-mail address
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: d687c5b3393a22e0db6473f0572a332f211c7102
Component: engine
2014-08-07 15:32:11 -06:00
Peter Waller 1b6a85626e Run hack/generate-authors.sh
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: 7d78dc33b15c9c5fd4cc2c0c5526cdfd5505ee4f
Component: engine
2014-08-07 15:32:11 -06:00
Peter Bourgon b75c55fd72 Only import "testing" from *_test.go
This prevents the testing package flags from leaking into the flagsets
of binaries that import docker. I left integration-cli alone.

Docker-DCO-1.1-Signed-off-by: Peter Bourgon <peter@bourgon.org> (github: peterbourgon)
Upstream-commit: b87daf6d697655ca092bf54717a64b07504a13c1
Component: engine
2014-08-07 14:25:21 -07:00
Tibor Vass 456929c3f9 Merge pull request #7389 from tianon/replace-amd64-build-tags-with-cgo-as-appropriate
Replace amd64 build tags with cgo as appropriate
Upstream-commit: ab3e34e1874872854e93c290990e081e1b202b65
Component: engine
2014-08-07 16:24:19 -04:00
Tianon Gravi 363a612198 Merge pull request #7413 from cpuguy83/7319_use_blackfriday_not_pandoc_for_manfile_gen
Use pure go markdown processor to generate man files
Upstream-commit: 45a239c1682e435848b03a34f484879e7bbc0ea7
Component: engine
2014-08-07 14:23:49 -06:00
Michael Crosby a4215f0a92 Merge pull request #7443 from ewindisch/name-id-lookup-reversal
Container name lookups to prefer IDs over names
Upstream-commit: 140e6abb17a85a569416236352a4fb07ce508480
Component: engine
2014-08-07 11:14:47 -07:00
Tianon Gravi 7366604091 Merge pull request #7423 from tianon/nuclear-_-weapons--we-got-the-bomb
Add contrib/nuke-graph-directory.sh script to clean out old /var/lib/docker directories much more easily
Upstream-commit: abbfc7e828e380b485bb706c2da3ffaa7c4201f3
Component: engine
2014-08-07 12:11:50 -06:00
Brian Goff 51a5b1b1f0 Merge pull request #7446 from cpuguy83/cleanup_extract_bindmount_spec_parsing
Cleanup: extract bindmount spec parsing
Upstream-commit: dc296903f072b8e710954954acecad4ccd4e04b6
Component: engine
2014-08-07 11:48:07 -04:00