21e36ab36c
command line nit
2014-05-17 22:04:41 -07:00
3cec63d56f
client: Rip out HTTP check from docker version
...
For background to this change please see:
https://github.com/dotcloud/docker/issues/4802
https://github.com/dotcloud/docker/pull/5670
Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
2014-05-18 02:22:22 +01:00
82712ed67e
client: rearrange docker version output
...
Rearrange docker version output so that server output matches client
output
Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
2014-05-18 01:49:58 +01:00
a52db7d880
Fixed description and keywords on Ubuntu installation docs
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-05-17 22:18:08 +02:00
f9728de7a3
Add README.md file for sysinit directory
...
Note, this text is just copied from sysinit.go
See Issue #5873
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: https://github.com/timthelion )
2014-05-17 18:12:44 +00:00
8dfd4b677b
Add readme for the daemonconfig directory
...
See Issue #5873
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: https://github.com/timthelion )
2014-05-17 18:01:47 +00:00
b175b4dd43
Add readme for daemon directory
...
See issue #5873
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: https://github.com/timthelion )
2014-05-17 17:56:02 +00:00
28fc387cf0
Add readme file for the archive directory
...
See issue #5873
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: https://github.com/timthelion )
2014-05-17 17:48:07 +00:00
3e2b97ef26
Add readme file for the api directory
...
See issue #5873
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: https://github.com/timthelion )
2014-05-17 17:37:05 +00:00
58c11ee0a8
integcli: speed up TestBuildSixtySteps
...
This improves the TestBuildSixtySteps test by switching from busybox to
scratch and simply adding a file.
This lowers the execution time of that test from 20 seconds to 5
seconds.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-17 17:25:56 +03:00
9405a58e99
Merge pull request #5850 from rhatdan/fixmanpage
...
Add description of --volume read-only/read-write to docker-run man page.
2014-05-17 10:50:18 +02:00
4dabca9046
Merge pull request #5832 from stevenburgess/documentation_cli_fix
...
Refactor b.tar -> busybox.tar
2014-05-17 09:42:20 +01:00
4bf03a0fac
gocapability: upstream fix for unsporrted caps
...
@vmarmol has made the fix upstream for not failing if the capability
being dropped is returned as invalid from the syscall, which is the case
when the capability is not supported on the host.
This is a blocker presently for RHEL6.5 on CAP_SYSLOG. We have patched
around this in our RPM for the time being, but this is the proper fix.
See also https://github.com/dotcloud/docker/pull/5810
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-05-17 03:51:02 -04:00
ab6027324d
Make Cristian maintainer of integration-cli (he wrote it)
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-05-16 19:03:08 -07:00
cc84dd0967
Merge pull request #5863 from vieux/pr5862
...
Make libcontainer's CapabilitiesMask into a []string (Capabilities). + add support for CAP_FOWNER
2014-05-16 18:23:50 -07:00
9e7757a3d2
Merge pull request #5827 from vieux/fix_multiple_events_on_same_computer
...
allow 2 docker events to be opened on the same computer over unix socket
2014-05-16 18:17:46 -07:00
a0070f0c17
add support for CAP_FOWNER
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-17 01:16:07 +00:00
92614928ce
Make libcontainer's CapabilitiesMask into a []string (Capabilities).
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
2014-05-17 00:44:10 +00:00
42734394b0
Remove Trailing Whitespace in User-Agent
...
After removed, the User-Agent shows in log like this:
[debug] http.go:160 https://index.docker.io/v1/repositories/busybox/images --
HEADERS: map[User-Agent:[docker/0.11.1-dev go/go1.2.2 git-commit/8887e00-dirty kernel/3.14.3-n1 os/linux arch/amd64]]
The code also moved all validation work into validVersion,
to keep the main logic as clean.
Docker-DCO-1.1-Signed-off-by: Derek <crq@kernel.org> (github: crquan)
2014-05-16 17:15:04 -07:00
704e9f9ff0
Merge pull request #5761 from SvenDowideit/pr_out_tell_the_user_not_to_run_from_osx
...
tell the user not to run -d from OSX
2014-05-16 16:52:08 -07:00
f5b1afae74
add test for issue #5270
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-17 02:38:29 +03:00
33d5b38d62
use ValidateContextDirectory to validate context
...
This commit makes the Docker cli client use ValidateContextDirectory
before attempting to create a tarball out of the context. This ensures
we avoid errors such as "unexpected EOF" during the upload of the
context.
This check is done before uploading any data and can save time and
bandwidth for remote Docker daemons.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-17 02:38:29 +03:00
1dedcd0d37
add ValidateContextDirectory to utils/utils.go
...
This commit adds a function which can be used to ensure all contents of
a directory can be accessed.
This function doesn't follow symlinks to check if they're pointing to
files which exist. Such symlinks can be useful later.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-17 02:38:28 +03:00
46578a2359
integcli: resolve full path to docker binary
...
Setting dockerBinary to the full path of the Docker binary is a good
idea and this is now done in the test code.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-17 02:38:28 +03:00
6f651ec62b
Merge pull request #5851 from proppy/archive-simple-detect
...
archive: simplify DetectCompression
2014-05-16 16:32:55 -07:00
eb61a1f73a
Merge pull request #5822 from creack/update_vendors
...
Update archive/tar vendored
2014-05-16 16:31:37 -07:00
4a3aefbb52
archive: add missing bytes package
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-05-16 16:26:28 -07:00
67ce59a806
archive: fix panic if len(source) < len(m)
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-05-16 16:25:56 -07:00
3118952e0a
archive: simplify DetectCompression
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-05-16 16:25:56 -07:00
58b49e60bb
Merge pull request #4882 from vieux/fix_merge_issue_tty
...
Fix merge issue tty
2014-05-16 15:42:43 -07:00
2c8b63cb75
do not merge -i or -t options
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-05-16 22:31:16 +00:00
366f084eb0
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-05-16 22:23:32 +00:00
00ce30bc74
Merge pull request #5571 from vieux/fix_race_docker_daemon
...
Fix race docker daemon
2014-05-16 13:57:43 -07:00
1adc2fa533
Merge pull request #5853 from proppy/update-tarfilter-comment
...
archive: update TarFilter comments
2014-05-16 13:06:12 -07:00
4b587ac118
Merge pull request #5436 from hobofan/master
...
reapply Cmd value even if CmdAdd returns early
2014-05-16 12:45:23 -07:00
311614952e
archive: update TarFilter comments
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-05-16 12:44:42 -07:00
2e0d47e5c4
Add description of --volume read-only/read-write to docker-run man page.
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-05-16 15:06:34 -04:00
62c3183fc8
Merge pull request #5833 from ActiveState/fix_nsinit_env_panic
...
fix panic when passing empty environment
2014-05-16 12:03:26 -07:00
d787f2731e
fix panic when passing empty environment
...
Docker-DCO-1.1-Signed-off-by: Sridhar Ratnakumar <github@srid.name> (github: srid)
2014-05-16 11:55:34 -07:00
01d10d6f13
Merge pull request #5810 from vmarmol/drop-caps
...
Change libcontainer to drop all capabilities by default.
2014-05-16 11:51:41 -07:00
23062e55fd
Merge pull request #5396 from lalyos/5370-infinite-loop-caused-by-symlink
...
5370 infinite loop caused by symlink
2014-05-16 11:28:37 -07:00
808d28033b
Merge pull request #5841 from unclejack/run_pull_latest
...
run: pull only latest when no tag specified
2014-05-16 11:21:29 -07:00
dbd6f10b3d
Merge pull request #5842 from alexlarsson/dm-cleanup-tests
...
devicemapper: Remove non-general tests
2014-05-16 11:08:04 -07:00
2b3b03b596
Merge pull request #5837 from proppy/patch-2
...
server/buildfile: correct daemon.Create comments
2014-05-16 10:51:09 -07:00
8b31824ad6
server/buildfile: correct daemon.Create comments
...
s/and start it//
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-05-16 10:50:02 -07:00
021ac36a70
Merge pull request #5838 from timthelion/patch-1
...
Typo in execdrivers.go five => give
2014-05-16 10:49:44 -07:00
6dd4fa0b74
Merge pull request #5840 from unclejack/upstart_mounted
...
Update contrib/init/upstart to "start on local-filesystems"
2014-05-16 10:16:34 -06:00
ba0c829291
contrib/init/upstart: start on local-filesystems
...
This changes the upstart init script to start on `local-filesystems`.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-16 19:12:59 +03:00
1ee423bd5d
added timeout when waiting for docker pidfile
...
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
2014-05-16 09:36:54 -04:00
a598dba134
Wait for pidfile to exist when starting with Redhat init script
...
Fixes #5359
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
2014-05-16 09:08:59 -04:00
Adam Singer
Jonathan McCrohan
James Turnbull
Timothy
unclejack
O.S. Tezer
Vincent Batts
Solomon Hykes
Michael Crosby
Victor Vieux
Victor Vieux
Victor Marmol
Derek
Guillaume J. Charmes
Johan Euphrosine
Dan Walsh
Sridhar Ratnakumar
Tianon Gravi
Chris St. Pierre