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
Aanand Prasad
342ed948ec
Merge pull request #379 from docker/use-library-python-image-for-dockerfile
...
Use library python image for dockerfile
2014-08-07 17:06:38 -07: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
Ben Firshman
3fc7ad3291
Don't use deprecated orchardup/python image
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-08-07 16:43:59 -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
Aanand Prasad
a39460d7b2
Merge pull request #392 from bfirsh/more-official-images
...
More official images
2014-08-07 16:42:36 -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
Chris Corbyn
6ab084a338
Merge pull request #390 from bfirsh/remove-integration-tests-from-ci
...
Remove integration tests from ci
2014-08-08 08:37:12 +10: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
Ben Firshman
406425a6b9
Use official images in rails tutorial
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-08-07 14:54:59 -07:00
Chris Corbyn
b690b0d20e
Merge pull request #387 from dnephin/make_ps_work_on_jekins
...
tty width on jenkins
2014-08-08 07:54:00 +10:00
Michael Crosby
bc9f5cdeb5
Merge pull request #7329 from erikh/move_broadcastwriter
...
Cleanup: utils/broadcastwriter -> pkg/broadcastwriter
2014-08-07 14:51:42 -07:00
Ben Firshman
796df302dd
Use official images on getting started guide
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-08-07 14:50:55 -07:00
Aanand Prasad
1346805bef
Merge pull request #391 from bfirsh/repository-move
...
github.com/docker/fig
2014-08-07 14:49:26 -07:00
Ben Firshman
16744bc78b
Switch to official images in readme
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-08-07 14:48:29 -07:00
Michael Crosby
e907df8d93
Merge pull request #7474 from crosbymichael/testing-import
...
Only import "testing" in test packages
2014-08-07 14:48:00 -07:00
Ben Firshman
fc3c12ad90
Update repository URL
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-08-07 14:42:49 -07:00
Ben Firshman
bbcbe9df9f
Upload PyPi package manually
...
This never worked properly anyway.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-08-07 14:36:49 -07:00
Ben Firshman
1a240f50ae
Remove integration tests from Travis
...
Orchard is going away and Travis will be able to run these soon
anyway.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-08-07 14:35:22 -07:00
Michael Crosby
b386bce1f1
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 >
2014-08-07 14:33:09 -07:00
Tianon Gravi
7a34f13433
Regenerate AUTHORS one more time
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-08-07 15:32:11 -06:00
Peter Waller
f8f36ff320
Add a few canonicalized author names
...
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-08-07 15:32:11 -06:00
Peter Waller
d687c5b339
Change Peter Waller's canonical e-mail address
...
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-08-07 15:32:11 -06:00
Peter Waller
7d78dc33b1
Run hack/generate-authors.sh
...
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-08-07 15:32:11 -06:00
Peter Bourgon
b87daf6d69
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)
2014-08-07 14:25:21 -07:00
Ben Firshman
47970761c5
Remove Orchard message from readme
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-08-07 14:19:27 -07:00
Aanand Prasad
df7bc8cbb8
Merge pull request #389 from orchardup/update-irc-channel
...
Update IRC channel to be #docker-fig
2014-08-07 13:43:12 -07:00
Ben Firshman
ba9d744293
Update IRC channel to be #docker-fig
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-08-07 13:39:27 -07:00
Tibor Vass
ab3e34e187
Merge pull request #7389 from tianon/replace-amd64-build-tags-with-cgo-as-appropriate
...
Replace amd64 build tags with cgo as appropriate
2014-08-07 16:24:19 -04:00
Tianon Gravi
45a239c168
Merge pull request #7413 from cpuguy83/7319_use_blackfriday_not_pandoc_for_manfile_gen
...
Use pure go markdown processor to generate man files
2014-08-07 14:23:49 -06:00
Michael Crosby
140e6abb17
Merge pull request #7443 from ewindisch/name-id-lookup-reversal
...
Container name lookups to prefer IDs over names
2014-08-07 11:14:47 -07:00
Tianon Gravi
abbfc7e828
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
2014-08-07 12:11:50 -06:00
Aanand Prasad
d5854bb625
Merge pull request #388 from orchardup/dockerize
...
Point at Docker website and Docker IRC channel
2014-08-07 10:16:16 -07:00
Ben Firshman
e5f7690137
Point at Docker website and Docker IRC channel
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-08-07 10:15:01 -07:00
Daniel Nephin
b0f398caaa
Resolves #386 , tty width on jenkins
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
2014-08-07 12:30:01 -04:00
Brian Goff
dc296903f0
Merge pull request #7446 from cpuguy83/cleanup_extract_bindmount_spec_parsing
...
Cleanup: extract bindmount spec parsing
2014-08-07 11:48:07 -04:00
Brian Goff
3f136dc0e0
Use pure go markdown processor to generate man files
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-08-07 07:06:39 -04:00