Commit Graph

7111 Commits

Author SHA1 Message Date
Guillaume J. Charmes 029aac9639
Use BSD raw mode on darwin. Fixes nano, tmux and others
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-03-13 11:11:02 -07:00
Victor Vieux 6ac6619a1e Merge pull request #4387 from unclejack/multiple_metadata_retrieval_attempts
retry to retrieve layer metadata on failure during pull
2014-03-13 11:03:52 -07:00
Tianon Gravi 44fe8cbbd1 Update to double-dash everywhere
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-13 11:46:02 -06:00
Victor Vieux 9a0d7fe018 use mock for search
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-13 17:40:34 +00:00
Sven Dowideit 51a46e6a4f Merge pull request #4638 from ichik1/cli-doc-minor-fix
Some minor fixes for cli docs
2014-03-13 20:11:10 +10:00
James Turnbull 0e871edfeb Merge pull request #4636 from phillipalexander/fix-license
Fix boilerplate text in Apache license
2014-03-13 02:42:56 -04:00
Phillip Alexander 73596b00e0 Fix boilerplate text in Apache license
This commit updates the Apache license boilerplate with actual information. The Apache license appendix (designed to be removed before publication) states:

```
APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)...
```

Additionally, the copyright year was not included. Copyright notices must reflect the current year. This commit updates the listed year to 2014.

see: http://www.copyright.gov/circs/circ01.pdf for more info

Docker-DCO-1.1-Signed-off-by: Phillip Alexander <git@phillipalexander.io> (github: phillipalexander)
2014-03-12 23:39:36 -07:00
Ken ICHIKAWA 841fcad0ba Add missing options -t and -v to images subcommand doc
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
2014-03-13 15:19:42 +09:00
Ken ICHIKAWA 471aa870f5 Remove duplicated description of --mtu
commit baa70e9751 duplicates
the description of --mtu.
This patch removes the duplicated description.

Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
2014-03-13 14:18:13 +09:00
Guillaume J. Charmes c7564b5e4d Merge pull request #4612 from tianon/cleaner-test-output
Cleaner test output
2014-03-12 17:54:14 -07:00
Guillaume J. Charmes db1afee3f0 Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit
merge existing config when committing
2014-03-12 17:49:11 -07:00
Sven Dowideit 94f2d52405 Merge pull request #4619 from dgageot/patch-1
Update port_redirection.rst
2014-03-13 09:31:16 +10:00
Guillaume J. Charmes 8e0a4802ab Merge pull request #4492 from ichik1/add-ip-forward-to-docs
Update daemon docs for --ip-forward
2014-03-12 16:29:33 -07:00
Guillaume J. Charmes 6a325f1c7a
Fix issue when /etc/apparmor.d does not exists
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-03-12 11:13:24 -07:00
Victor Vieux bd1c512594 Merge pull request #4621 from unclejack/fix_empty_cidfile
don't leave empty CIDFile behind
2014-03-12 11:12:51 -07:00
unclejack a56d1b93a1 don't leave empty cidFile behind
This makes `--cidfile` clean up empty container ID files. These are
left behind when creating the container fails.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-12 19:36:19 +02:00
Michael Crosby 63dee4ebc4 Merge pull request #4604 from vieux/improve_deprecation_warning_flags
improve deprecation message
2014-03-12 10:18:49 -07:00
Michael Crosby ba49f5bce1 Merge pull request #4603 from creack/fix_osx_attach
Fix OSX attach exit issue
2014-03-12 10:08:55 -07:00
David Gageot 2a5e1abaa9 Update port_redirection.rst
Fix flags
2014-03-12 15:42:10 +01:00
Sven Dowideit 2ad16c88e2 Merge pull request #4526 from Rovanion/master
All caps variables in normal bash should be avoided not to accidentally collide with environment variables.
2014-03-12 22:24:00 +10:00
James Turnbull a5fa161ff8 Merge pull request #4143 from SvenDowideit/apt-cacher-example
Show some ENV / local updated baseimage tricks that use an apt-cacher-ng...
2014-03-12 08:20:42 -04:00
unclejack 2cfcf42d50 retry to retrieve metadata on failure during pull
This makes Docker retry to retrieve the JSON metadata for the layers.
Docker will make 5 attempts to retrieve the metadata before failing and
it will increase the delay between attempts after each failed attempt.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-12 14:05:43 +02:00
Sven Dowideit 8bf63d5326 fixes suggested by James
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-03-12 22:02:24 +10:00
Tianon Gravi 99b6364790 Exclude more "definitely not unit tested Go source code" directories from hack/make/test
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-12 01:18:12 -06:00
Tianon Gravi e1c48fa560 Clean up the "go test" output from "make test" to be much more readable/scannable
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-12 01:17:38 -06:00
Ken ICHIKAWA b7ae9984fb Update daemon docs and help messages for --iptables and --ip-forward
Fix docs and help messages of --iptables and --ip-forward to describe the true case behaviour

Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
2014-03-12 13:50:03 +09:00
Tianon Gravi f544ebd55a Merge pull request #4574 from tianon/fix-cgroup-hax
Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount...
2014-03-11 22:21:01 -06:00
Sven Dowideit bf009b530e Merge pull request #4541 from scollier/master
Adding the new options to the `docker ps` documentation.
2014-03-12 11:36:12 +10:00
Scott Collier fbf74eb079 Removing HEAD tag from last commit
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
2014-03-11 20:00:16 -05:00
Scott Collier 7178b285a3 Adding CLI options to the commandline reference documentation.
Fixing bad DCO sig

URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
2014-03-11 19:54:48 -05:00
Victor Vieux f0eb227548 improve deprecation message
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-12 00:51:46 +00:00
Scott Collier baa70e9751 Adding the new options to the `docker ps` documentation.
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

Adding the new options to the `docker ps` documentation.

URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

Adding CLI options to the commandline reference documentation.

URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

changing indention

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
2014-03-11 19:51:30 -05:00
Guillaume J. Charmes 95e5910ab2
Fix attach exit on darwin
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-03-11 17:51:29 -07:00
Victor Vieux f9fde52a07 Merge pull request #4598 from creack/fix_lxc
Fix lxc
2014-03-11 17:17:54 -07:00
Tianon Gravi 7b79f597f6 Merge pull request #4521 from tianon/release-checklist-origin
Note within the RELEASE-CHECKLIST that "origin" is assumed to be upstream
2014-03-11 14:34:47 -06:00
Michael Crosby b55a79aa1c Merge pull request #4504 from alexlarsson/devicemapper-waits
devmapper: Increase sleep times and unlock while sleeping
2014-03-11 13:17:53 -07:00
Guillaume J. Charmes fd0737df2c
Update parseLxcInfo to comply with new lxc1.0 format
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-03-11 12:08:32 -07:00
Guillaume J. Charmes 721562f296
Remove goroutine leak upon error
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-03-11 11:39:28 -07:00
Victor Vieux 3715f46b8b Merge pull request #4491 from crosbymichael/add-pull-dep
Add deprecation warning for -t on pull
2014-03-11 10:22:06 -07:00
Victor Vieux 0a6d9035cf Merge pull request #4589 from creack/update_maintainer
Update MAINTAINER email + add self to pkg/signal MAINTAINER
2014-03-11 10:18:37 -07:00
Guillaume J. Charmes 7654bac442 Merge pull request #4466 from alexlarsson/execdrivers
Move execdriver construction into execdriver/execdrivers
2014-03-11 10:14:20 -07:00
Michael Crosby 15e52ccaad Add deprecation warning for -t on pull
Closes #3410
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-11 10:11:05 -07:00
Guillaume J. Charmes af3ff044a2 Merge pull request #4499 from alexlarsson/fix-remove-fail
DeviceMapper: Succeed immediately when removing non-existant devices
2014-03-11 10:09:58 -07:00
Guillaume J. Charmes 6169dafab3 Merge pull request #4569 from dolph/master
spelling correction
2014-03-11 09:19:46 -07:00
Guillaume J. Charmes 037f942a0b Merge pull request #4583 from kzys/freebsd-signal
Like signal_linux.go, we don't have import os and os/signal
2014-03-11 09:01:39 -07:00
Alexander Larsson 07c35b41a5 Move execdriver construction into execdriver/execdrivers
This can't be in execdriver (dependency loop) but should not be
hardcoded inside runtime.go either. So we put it in a subpackage.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-03-11 16:37:19 +01:00
Kato Kazuyoshi b2cd89056f Like signal_linux.go, we don't have import os and os/signal
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
2014-03-11 23:14:58 +09:00
James Turnbull e50a5fcb0d Merge pull request #4577 from SvenDowideit/moltar-perl-modules
add Net::Docker CPAN module
2014-03-11 09:37:44 -04:00
Sven Dowideit b348ee0fd0 add Net::Docker CPAN module
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-03-11 20:28:26 +10:00
Tianon Gravi 76dc670f41 Add variable for DOCKER_LOGFILE to sysvinit and use append instead of overwrite in opening the logfile
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-11 01:40:31 -06:00