Commit Graph

13925 Commits

Author SHA1 Message Date
Marc Abramowitz 301b3ffbbb CONTRIBUTING.md: punctuation fixes
Signed-off-by: Marc Abramowitz <marc@marc-abramowitz.com>
2015-02-24 08:21:49 -08:00
Michal Minar d96e885314 Fixed bad handling of "container not found" error
Create container job could fail because a container specified with
`--volumes-from` does not exist. This error is not propagated to client
though. Instead it's recognized by higher levels as "image not found".
Client then tries to pull the image and launch the container again.

This patch changes the lower level error message so that it's not
recognized as "image not found" and thus it's propagated to client.

Signed-off-by: Michal Minar <miminar@redhat.com>
2015-02-24 15:52:47 +01:00
Lei Jitang 7c7c7f84dc Fix docker commit make a paused container to unpaused. Closes #10932
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-02-24 03:28:40 -08:00
Sven Dowideit 1d27930faa Merge pull request #10724 from SvenDowideit/takeover-10470
Update best practices for entrypoint.
2015-02-24 15:32:16 +10:00
Sven Dowideit ad2063ca84 Merge pull request #10923 from bradleywright/patch-1
Fix erroneously wrapped URLs in links
2015-02-24 15:31:40 +10:00
Sven Dowideit e500c00d7c Merge pull request #10929 from thaJeztah/docs-optimize-images
docs: optimize and consolidate images, remove duplicates
2015-02-24 15:31:00 +10:00
Jessie Frazelle 347a418f35 Merge pull request #10973 from crosbymichael/phil-maintainer
Add Phil Estes as a core maintainer
2015-02-23 19:24:22 -08:00
Michael Crosby 30ede36324 Add Phil Estes as a core maintainer
Phil has been very active across the repository for a few months now.
He has not only triaged issues but also contributed to features and bug
fixes and is a very active participant on the project.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-23 17:07:12 -08:00
Jessie Frazelle 09c4b45712 Merge pull request #10936 from vincentbernat/fix/zsh-completion-update-3
zsh: update zsh completion for docker command
2015-02-23 16:01:59 -08:00
Alexander Morozov 02c8881596 Merge pull request #10933 from ahmetalpbalkan/version-daemon-os-arch
cli: Add server OS/Arch info to 'version' cmd
2015-02-23 15:26:53 -08:00
Jessie Frazelle fd185eddf6 Merge pull request #10908 from duglin/EnvDollarTest
Add a ENV tests with special chars in the values
2015-02-23 15:25:31 -08:00
Vincent Bernat 33fa197879 zsh: update zsh completion for docker command
zsh completion is updated with the content of
felixr/docker-zsh-completion.

ef4a3fce0437 Update completion for `wait' as per 1.5.0
ace5aa9c1282 Add completion for `stats'
91f112834865 Update completion for `search' as per 1.5.0
a5e4febe4bf6 Update completion for `save' as per 1.5.0
1cdbdb18a384 Add completion for `rename'
2f004bb724b9 Update completion for `pull' as per 1.5.0
773b88e0885b Update completion for `logs' as per 1.5.0
c57e5d5c4551 Update completion for `load' to favor archive files
9af7d12b487e Update completion for `images` as per 1.5.0
0d59e66aff30 update completion for `exec' to complete on commands
46b6c66760d7 Update completion for `events' as per 1.5.0
307e0bdc4c34 Update completion for `commit' as per 1.5.0
c4b331f38cc4 Update completion for `build' as per 1.5.0

Also added myself in the `MAINTAINERS` file.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
2015-02-24 00:16:30 +01:00
Jessie Frazelle ac06d0c46a Merge pull request #10921 from duglin/FixNonverboseBuild
Build w/o verbose hangs w/RUN
2015-02-23 15:15:12 -08:00
Jessie Frazelle b27bb2f255 Merge pull request #10938 from thaJeztah/update-copyright-year-in-notice
Update copyright year in NOTICE
2015-02-23 15:12:38 -08:00
Jessie Frazelle 8f3ecf8779 Merge pull request #10925 from brahmaroutu/pkgdependency_10922
Removing dependencies from pkg into Docker internal code
2015-02-23 14:49:19 -08:00
Ahmet Alp Balkan 3346c2e4d9 cli: Add server OS/Arch info to 'version' cmd
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-23 14:32:25 -08:00
Jessie Frazelle f6100a5d9d Merge pull request #10889 from ahmetalpbalkan/win-cli/SameHostDaemon-skips
integration-cli: Skip tests which require daemon/cli to be on the same host
2015-02-23 14:28:06 -08:00
Michael Crosby 66315f48e5 Merge pull request #10948 from kookster/patch-1
Have docker command use $HOME instead of '/Users/mary'
2015-02-23 14:27:42 -08:00
Ahmet Alp Balkan b686b65c9b integ-cli: Skip tests assuming daemon/cli are on the same host
Some integration-cli tests assume daemon and cli are running
on the same machine and therefore they examine side effects
of executed docker commands on docker host by reading files
or running other sort of commands.

In case of windows/darwin CLI tests these provide little
or no value and should be OK to skip.

List of skipped tests:
- `TestContainerNetworkMode`
- `TestCpVolumePath`
- `TestCreateVolumesCreated`
- `TestBuildContextCleanup`
- `TestBuildContextCleanupFailedBuild`
- `TestLinksEtcHostsContentMatch`
- `TestRmContainerWithRemovedVolume`
- `TestRunModeIpcHost`
- `TestRunModeIpcContainer`
- `TestRunModePidHost`
- `TestRunNetHost`
- `TestRunDeallocatePortOnMissingIptablesRule`
- `TestRunPortInUse`
- `TestRunPortProxy`
- `TestRunMountOrdering`
- `TestRunModeHostname`
- `TestRunDnsDefaultOptions`
- `TestRunDnsOptionsBasedOnHostResolvConf`
- `TestRunResolvconfUpdater`
- `TestRunVolumesNotRecreatedOnStart`

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-23 14:08:05 -08:00
Jessie Frazelle ae9001fbdc Merge pull request #10926 from cpuguy83/10685_check_nil_volume
Check nil volume on mount init
2015-02-23 13:55:38 -08:00
Tianon Gravi 44adbf23b5 Cleanup "autogen/" if we have successful build
This way, we only leave around autogenerated files if the build fails (which is reasonable IMO, since that's when you'd need them for debugging the build failure).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-23 14:12:44 -07:00
Jessie Frazelle 83bf0ac96d Merge pull request #10954 from icecrime/update_release_checklist
Update RELEASE-CHECKLIST.md
2015-02-23 12:20:04 -08:00
Tianon Gravi 3562997296 Merge pull request #10951 from tianon/fix-dynbinary
Fix dynbinary with new autogen code
2015-02-23 12:08:17 -08:00
Tianon Gravi acda41e7c3 Merge pull request #10887 from lkinley/master
Patch mkimage-yum.sh to work with Amazon Linux (2014.09)
2015-02-23 11:43:12 -08:00
Arnaud Porterie d1b515dcc5 Update RELEASE-CHECKLIST.md
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-02-23 11:34:22 -08:00
Doug Davis ed3bc3b986 Add a ENV tests with special chars in the values
Tests a little bit of escaping quotes too

See https://github.com/docker/docker/pull/10431#issuecomment-75163177

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-02-23 11:31:38 -08:00
Srini Brahmaroutu 7a9c944b82 Removing dependencies from pkg into Docker internal code
Closes #10922

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-02-23 18:43:10 +00:00
Tianon Gravi a936ea88da Fix dynbinary with new autogen code
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-23 11:19:51 -07:00
Michael Crosby e82cf741e3 Merge pull request #10698 from crosbymichael/issue-triage
Add issue triage document
2015-02-23 10:18:04 -08:00
Andrew Kuklewicz f9bb0afc6c Have docker command use $HOME instead of 'mary'
Signed-off-by: Andrew Kuklewicz <andrew@beginsinwonder.com>
2015-02-23 12:37:11 -05:00
Alexander Morozov 05ba127f06 Merge pull request #10945 from delftswa2014/daemon-rm
Rename Daemon.Destroy to Daemon.Rm to be consistent with CLI command.
2015-02-23 09:22:58 -08:00
Rik Nijessen ba93f8316c Rename Destroy to Rm to be consistent with CLI.
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
2015-02-23 16:15:56 +01:00
Sebastiaan van Stijn 743f0bcc83 docs: optimize and consolidate images, remove duplicates
This optimizes a number of images and removes a duplicate image.
Also consolidated images in the 'docker-hub' section.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-02-23 12:10:54 +01:00
Abin Shahab 1a26ed09ee Implements stats for lxc driver
Implements stats and fixes stats test.

Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
2015-02-23 10:16:52 +00:00
Sven Dowideit 814916457b tweak the prose a little
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-23 14:44:31 +10:00
Daniel YC Lin 8c19e43dff Update sample systemd for container
1. Docker require to run before redis container run.
2. 'start' command can not accept more options like "run -e xx ..."
3. Remove wrong command 'Author='

Signed-off-by: Daniel YC Lin <dlin.tw@gmail>
2015-02-23 14:44:31 +10:00
Fred Lifton 7d2188f995 Merge pull request #10918 from cpuguy83/10278_fix_create_docs_for_volumes
Remove CLI doc entry related to API-only function
2015-02-22 18:11:18 -08:00
Sven Dowideit 3c9d45e213 a little re-writing
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-23 12:00:50 +10:00
Jessica Frazelle 6009f2eac4 Update best practices for entrypoint.
Despite being wrong we are kinda calling our users dumb, I feel it is a bit
demeaning. As well as just wrong.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
2015-02-23 12:00:50 +10:00
James Turnbull bac58e9711 Merge pull request #10927 from hyp3rdino/patch-1
Update mac.md
2015-02-22 20:39:53 -05:00
James Turnbull 74394f03ac Merge pull request #10930 from caryhartline/patch-1
Fix three spelling mistakes
2015-02-22 20:28:42 -05:00
James Turnbull e8484a3438 Merge pull request #10942 from sdreyesg/patch-1
"docker run hello-world" instead of "docker hello-world"
2015-02-22 20:28:19 -05:00
James Turnbull c23d0805bb Merge pull request #10941 from dottorblaster/master
New padding-right for the docs' left navigation
2015-02-22 20:27:55 -05:00
sdreyesg f37351f9e8 Update mac.md
I just tried this guide. I had to use "docker run hello-world" instead of "docker run"

Signed-off-by: Dario Galvis <sdreyesg@gmail.com>
2015-02-22 14:51:32 -08:00
Alessio Biancalana 47a847bca8 correcting a little visual bug
padding right: 10px; for #leftnav li

Signed-off-by: Alessio Biancalana <dottorblaster@gmail.com>
2015-02-22 22:59:41 +01:00
Cary 4c7d41ac18 Fix three spelling mistakes
There are three instances of "boo2docker" that should be changed to "boot2docker".

Signed-off-by: Cary Hartline <varmateo@icloud.com>
2015-02-22 14:47:39 -06:00
Marian Marinov 811132f4b9 docs/man/docker.1.md: spelling mistake fix
Signed-off-by: Marian Marinov <mm@yuhu.biz>
2015-02-22 22:47:22 +02:00
Sebastiaan van Stijn c28d33ff50 Update copyright year in NOTICE
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-02-22 20:43:51 +01:00
hyp3rdino 29b62053c4 Update mac.md
'docker hello-world' is not a docker command. 'docker run hello-world' is correct.

Signed-off-by: Markus Kortlang <hyp3rdino@googlemail.com>
2015-02-21 19:25:37 +01:00
Brian Goff 7122b6643e Check nil volume on mount init
Fixes #10685 panic in some cases.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-21 07:21:57 -05:00