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
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
eacd91aa24
Update gentoolinux.md
...
Upstream-commit: 6ba1949e6aed4b8a6d81b9ad4a43a4743f39ac32
Component: engine
2014-08-09 14:00:29 -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
5628018e6c
Merge pull request #7449 from shykes/cleanup-shutdown
...
Cleanup: refactor shutdown and signal handling facility
Upstream-commit: 2c90fde982c0919e60b0a63303b108089a5cdc1a
Component: engine
2014-08-08 19:39:51 -07:00
c27845ab5c
Merge pull request #7492 from crosbymichael/update-libcontainer-aug3
...
Update libcontainer to f2e78425c377acc7a67a35c3148
Upstream-commit: 93da07a8dc2b33e161d279fef35e2470e8beafaf
Component: engine
2014-08-08 17:44:13 -06:00
26a13c9e98
Merge pull request #7475 from erikh/fix_hostname_parsing
...
fix parsing of hostnames when we actually want IP addresses.
Upstream-commit: 983b4fc3bfade212bd61e58987e0c5bd32d134ea
Component: engine
2014-08-08 16:40:50 -07:00
d487159628
Update libcontainer to f2e78425c377acc7a67a35c3148
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: c74e8b544defeca8fb215a2295066e10f91bedda
Component: engine
2014-08-08 16:12:35 -07:00
0fdb50d077
First stab at nat tests.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 99a864431d7eb29840edb7aed78cb361eea7d6ac
Component: engine
2014-08-08 15:01:12 -07:00
819d34fe2e
fix parsing of hostnames when we actually want IP addresses.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 3c49cb17fb6014519925a069ad81c30ff41b3d7f
Component: engine
2014-08-08 15:01:10 -07: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
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
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
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
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
1b47516d28
Merge pull request #7458 from jamtur01/cg
...
Update CONTRIBUTING.md
Upstream-commit: 09ad385f64b8af06acab61828ac19ead6bd64222
Component: engine
2014-08-07 18:45:51 -07:00
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
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
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
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
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
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
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
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
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
0a94b187e4
Merge pull request #7474 from crosbymichael/testing-import
...
Only import "testing" in test packages
Upstream-commit: e907df8d93feaf00628eb293bd39a08a66d87222
Component: engine
2014-08-07 14:48:00 -07:00
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
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
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
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
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
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
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
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
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
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
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
3c371660e7
Use pure go markdown processor to generate man files
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 3f136dc0e0feb826eb67c2c2d600ee681a16bb02
Component: engine
2014-08-07 07:06:39 -04:00
bde3f4cb22
Make it clear that JSON array format should be used if CMD is used as default arguments
...
Signed-off-by: Xuecong Liao <satorulogic@gmail.com >
Upstream-commit: 6e0f072e36d7b367bde7b5c34fda9c47f36af2da
Component: engine
2014-08-07 15:06:09 +08:00
549f195299
Update CONTRIBUTING.md
...
Added link to community guidelines
Upstream-commit: 8891bb52def06aa4fe21af544c6a3a50ecfa9a5b
Component: engine
2014-08-07 02:23:00 -04:00
30c7baef5a
Merge pull request #7452 from shykes/7370-on-7427
...
Cleanup: move image management and logging out of deprecated Server
Upstream-commit: 7e12911f62080a5bf2f8da8583eebe95c648da68
Component: engine
2014-08-06 18:47:45 -07:00
5247a2be66
port usage of jsonlog to the new daemon files which were refactored
...
recently.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: bd373712d069f5f1f8d65bc25808a068a9afdd13
Component: engine
2014-08-06 16:45:04 -07:00
