21e5eefd8f
Removed merge conflict artifacts.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: e608312677d26f1f5b4f76852917d4f149ef88c1
Component: engine
2014-08-12 15:30:21 -07:00
d0c03fc901
Added fredlf's suggested changes.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: af5ced62ca604846b5e9ab852c7d47c9c176c702
Component: engine
2014-08-12 15:21:55 -07:00
0a10aaa4dd
Merge pull request #7538 from LK4D4/move_some_integration_to_cli
...
Move some integration to cli
Upstream-commit: 91a2f22acac569b8e1bf279845c53e0499de50d4
Component: engine
2014-08-12 14:17:08 -07:00
b1b27b03fb
Merge pull request #7466 from tiborvass/irc-meetings
...
Add irc-meetings section in CONTRIBUTING
Upstream-commit: 18a0eba72dfec57b02a799ae064a60a88d6988c9
Component: engine
2014-08-12 13:36:57 -04:00
137daba41a
Add irc-meetings section in CONTRIBUTING
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: c58c70b8bdfc4d13faefaab31d2d1539d5478223
Component: engine
2014-08-12 13:35:14 -04:00
9418307e16
Merge pull request #7528 from lalyos/fix_version_number_comparison
...
Fix version number comparison
Upstream-commit: 0771eb32dc2e52bd05053d8a0e529741fa639d49
Component: engine
2014-08-12 10:16:55 -07:00
547d1e2095
Merge pull request #7531 from ChristopherBiscardi/priv-repos
...
Private Repos Copy Change
Upstream-commit: d42326d9277dd12946981c7435d468807c462157
Component: engine
2014-08-12 09:50:21 -04:00
855652ad6c
Move TestRunExit to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: c19e0fe7e2c626218c854aa97fd3f23d29f11615
Component: engine
2014-08-12 13:40:14 +04:00
3f9bc8ad8a
Move TestRunWorkdirExistsAndIsFile to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: a44f065f171cb91867630e752c09fde4b01d4c98
Component: engine
2014-08-12 12:22:25 +04:00
f5781e0e49
Updates docs regarding linux mint troubleshot
...
Signed-off-by: Ciro S. Costa <ciro.costa@usp.br >
Upstream-commit: fcddecc828a95083db8975391e623289b2fe1254
Component: engine
2014-08-12 02:56:57 -03:00
7d5baeee4d
Merge pull request #7490 from crosbymichael/reexec
...
Use argv0 as reexec implementation for dockerinit
Upstream-commit: 01995ebebb3f26a2bd1e1131b5794e8b6b6ae18e
Component: engine
2014-08-11 18:43:34 -07:00
47e45ae0eb
Panic if trying to register an func with the same name
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 1a249a5feb9880465594299c1d4965b160e4a14e
Component: engine
2014-08-11 18:13:27 -07:00
b38de9ff8f
tell the user what to expect, including that it is a verbode process.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: b94f2c4c6d6fa7b3efc0dbf8874735b12d00b57c
Component: engine
2014-08-12 10:32:38 +10:00
9379864263
Private Repos Copy Change
...
Docker-DCO-1.1-Signed-off-by: Christopher Biscardi <biscarch@sketcht.com > (github: ChristopherBiscardi)
Upstream-commit: df9650eebb12d980aaf114ac7b2223764dc964b7
Component: engine
2014-08-11 16:37:58 -07:00
424449854e
Fix equal short-long version number comparison
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com >
Upstream-commit: 58ef92f89e5c6637506d2d03784daba50e82d7ff
Component: engine
2014-08-11 23:40:35 +02:00
29770af1da
Add test case for identical short and long version numbers
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com >
Upstream-commit: 8a4d2d6f7fc2f9ab5ea488d4b4ba76313862fbc0
Component: engine
2014-08-11 23:36:09 +02:00
09bdb7ffa9
Merge pull request #7516 from thaJeztah/faqs-explain-debian-noninteractive
...
Add "DEBIAN_FRONTEND" to FAQ
Upstream-commit: 8595a4ff7a18f6eb80e28d49d4dbecca794b369e
Component: engine
2014-08-11 14:19:06 -07:00
1b06736c1b
Add "DEBIAN_FRONTEND" to FAQ
...
Added some explanation on using ‘DEBIAN_FRONTEND’ to the FAQs. As
discussed here;
https://github.com/docker/docker/pull/7035#issuecomment-50967867
Docker-DCO-1.1-Signed-off-by: Sebastiaan van Stijn <github@gone.nl > (github: thaJeztah)
Upstream-commit: 2e5d35c1f1bf0b565b288fa9146059d9f3af61b7
Component: engine
2014-08-11 23:12:47 +02:00
c9eb513960
Merge pull request #7507 from shykes/cleanup-tiny
...
Cleanup: tiny little things
Upstream-commit: 57e0cbb991783f3b5a6b24afe6c5978cd9839a01
Component: engine
2014-08-11 12:41:17 -07:00
42c37ddd04
Fix hack in old integration test for new init
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 9694209241074c10d4cc625b24dfedcb2387de93
Component: engine
2014-08-11 11:47:22 -07:00
6697829a68
Remove unsued sysinit package
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 29af9c14e442f5cf3760f439d8c0fffaf84e2268
Component: engine
2014-08-11 11:47:21 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
301a2b811c
Rename a method for clarity
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: a110ce2f284d09df3e047b1999a1535770433d5f
Component: engine
2014-08-10 04:33:19 +00:00
b7e1bdfc34
Move declaration of DockerCli to top of file for readability
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 5e9b3727b8f5d101b7b1f859d4f95fdf8e91ed19
Component: engine
2014-08-10 04:31:59 +00:00
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
eacd91aa24
Update gentoolinux.md
...
Upstream-commit: 6ba1949e6aed4b8a6d81b9ad4a43a4743f39ac32
Component: engine
2014-08-09 14:00:29 -04:00
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
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
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
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
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
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
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
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
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
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
