Commit Graph

10393 Commits

Author SHA1 Message Date
Michael Crosby 9694209241 Fix hack in old integration test for new init
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-11 11:47:22 -07:00
Michael Crosby 29af9c14e4 Remove unsued sysinit package
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-11 11:47:21 -07:00
Michael Crosby 7321067176 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>
2014-08-11 11:47:21 -07:00
Tibor Vass e033425f0b Merge pull request #7502 from LK4D4/catch_error_console
Catch error on console creation
2014-08-11 12:13:53 -04:00
Tibor Vass 5ffbc8dc82 Merge pull request #7509 from LK4D4/fix_http_handler_error_log
Fix log message on http handler error
2014-08-11 12:12:33 -04:00
Tibor Vass e94d772910 Merge pull request #7499 from LK4D4/fix_events_error
Fix error message on logging events
2014-08-11 12:10:30 -04:00
Tibor Vass a9ff2fdfac Merge pull request #7520 from LK4D4/more_events_test
More events test
2014-08-11 12:09:11 -04:00
unclejack f4f1e4db70 Merge pull request #6301 from rail44/feature-load-only-not-exist-image
Use only unavailable image when load from Tarball
2014-08-11 11:28:52 +03:00
Alexandr Morozov 44842ea3d8 Test on untag and delete events
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-11 11:39:47 +04:00
Alexandr Morozov 17ab516fde Test on container events
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-11 10:42:55 +04:00
Solomon Hykes b74e507245 Merge pull request #7496 from shykes/cleanup-push-pull
Cleanup: move "pull" and "push" to graph/pull.go and graph/push.go
2014-08-10 23:29:28 -07:00
James Turnbull 9fa4bea03b Merge pull request #7489 from duglin/7281
fix for issue 7281
2014-08-10 13:27:21 -04:00
James Turnbull dfd6fcb548 Merge pull request #7498 from ostezer/fix-builds-errors
Docs: Fix builds.md line-length + minor typo issues
2014-08-10 13:26:16 -04:00
James Turnbull 7b13212076 Merge pull request #7501 from wyc/patch-1
Update gentoolinux.md
2014-08-10 13:20:14 -04:00
James Turnbull aa3bc6559b Merge pull request #7514 from phemmer/cli_cmd_prefix_fix
fix command output examples in cli documentation
2014-08-10 13:18:50 -04:00
Patrick Hemmer d613f11217 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)
2014-08-10 12:47:46 -04:00
Daniel Menet ea59aa8cb5 Expand hostname before passing it to NewRegistry()
Signed-off-by: Daniel Menet <membership@sontags.ch>
2014-08-10 11:48:34 +02:00
Alexandr Morozov e9aa6489a6 Fix log message on http handler error
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-10 13:30:22 +04:00
Solomon Hykes a110ce2f28 Rename a method for clarity
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-10 04:33:19 +00:00
Solomon Hykes 5e9b3727b8 Move declaration of DockerCli to top of file for readability
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-10 04:31:59 +00:00
Alexandr Morozov 93f6cf0351 Catch error on console creation
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-09 22:10:44 +04:00
wyc 6ba1949e6a Update gentoolinux.md 2014-08-09 14:00:29 -04:00
LK4D4 7afc49b40b Fix error message on logging events
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-09 18:45:38 +04:00
Doug Davis 55dc4f2b94 fix for issue 7281
add missing comma per O.S. Tezer's commment

Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-08-09 08:11:59 -04:00
O.S. Tezer 8b3f2381d0 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)
2014-08-09 14:55:47 +03:00
Daniel Menet cc3e94b9ba Enable `docker search` on private docker registry.
The cli interface works similar to other registry related commands:

  docker search foo

... searches for foo on the official hub

  docker search localhost:5000/foo

... does the same for the private reg at localhost:5000

Signed-off-by: Daniel Menet <membership@sontags.ch>
2014-08-09 09:16:54 +02:00
Michael Crosby 2c90fde982 Merge pull request #7449 from shykes/cleanup-shutdown
Cleanup: refactor shutdown and signal handling facility
2014-08-08 19:39:51 -07:00
Tianon Gravi 93da07a8dc Merge pull request #7492 from crosbymichael/update-libcontainer-aug3
Update libcontainer to f2e78425c377acc7a67a35c3148
2014-08-08 17:44:13 -06:00
Michael Crosby 983b4fc3bf Merge pull request #7475 from erikh/fix_hostname_parsing
fix parsing of hostnames when we actually want IP addresses.
2014-08-08 16:40:50 -07:00
Michael Crosby c74e8b544d Update libcontainer to f2e78425c377acc7a67a35c3148
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-08 16:12:35 -07:00
Erik Hollensbe 99a864431d First stab at nat tests.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-08 15:01:12 -07:00
Erik Hollensbe 3c49cb17fb fix parsing of hostnames when we actually want IP addresses.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-08 15:01:10 -07:00
Hollie Teal 2dc21af70b Merge pull request #7406 from hollietealok/docs_add
Added "Github Submodules" section to Automated Builds doc.
2014-08-08 09:40:42 -07:00
James Turnbull fb650d1e6d Merge pull request #7465 from flavio/update-opensuse-doc
Updated openSUSE's installation instructions
2014-08-08 11:28:27 -04:00
Tibor Vass 7dbab337dd Merge pull request #7479 from shykes/cleanup-server-info
Cleanup: move "info" to daemon/info.go
2014-08-08 09:34:14 -04:00
Satoshi Amemiya a34dd21611 Use only unavailable image when load from Tarball
Docker-DCO-1.1-Signed-off-by: Satoshi Amemiya <satoshi_amemiya@voyagegroup.com> (github: rail44)
2014-08-08 20:30:38 +09:00
Flavio Castelli 90e97960fa 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)
2014-08-08 12:36:20 +02:00
Solomon Hykes 6856a6b110 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>
2014-08-08 07:25:09 +00:00
James Turnbull 33d6b20c13 Merge pull request #7278 from Toebez/patch-1
Update nodejs_web_app.md
2014-08-07 23:16:37 -04:00
Solomon Hykes 94715e8e64 Move "info" to daemon/info.go
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-08 03:01:55 +00:00
Sven Dowideit 0ca010695c 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
2014-08-08 12:10:01 +10:00
Solomon Hykes 09ad385f64 Merge pull request #7458 from jamtur01/cg
Update CONTRIBUTING.md
2014-08-07 18:45:51 -07:00
Tianon Gravi 2767509894 Merge pull request #7476 from tianon/sysvinit-status-of-proc
Fix several minor issues with Debian sysvinit script
2014-08-07 19:30:42 -06:00
Michael Crosby 414ccee23a Merge pull request #7374 from cpuguy83/revert_rm_f_deprecation
Revert --stop/--kill and use SIGKILL instead
2014-08-07 16:47:25 -07:00
Michael Crosby 5d9cfde0df Merge pull request #7453 from shykes/new-subsystem-maintainers
Add maintainers to daemon/ and graph/
2014-08-07 16:43:41 -07:00
Tianon Gravi 478fdaf933 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>
2014-08-07 16:45:22 -06:00
Tibor Vass 860ab469cc Merge pull request #7473 from tianon/pwaller-authors
Update .mailmap with a few more addresses
2014-08-07 18:26:49 -04:00
unclejack b36f630817 Merge pull request #7304 from unclejack/refactor_build_tests
integration cli: minor refactor of the build tests
2014-08-08 01:24:51 +03:00
Brian Goff 95f86da641 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)
2014-08-07 18:20:43 -04:00
Michael Crosby 01022a305d Merge pull request #7405 from LK4D4/indicate_run_volume_test_pass
Print about "copy volume content" test passing
2014-08-07 15:09:41 -07:00