Commit Graph

13369 Commits

Author SHA1 Message Date
ab9941d980 Merge pull request #10957 from tianon/cleanup-autogen
Cleanup "autogen/" if we have successful build
Upstream-commit: a7cacbeb1d1b85e9c12874de8dc7493b73bcc624
Component: engine
2015-02-24 13:25:46 -08:00
7a7f9dbbc1 Merge pull request #10980 from miminar/fix-volumes-from
Fixed bad handling of "container not found" error
Upstream-commit: 478a9462e8776f60c8445972bcb3e506c6e7d413
Component: engine
2015-02-24 13:23:34 -08:00
901bce48ed Merge pull request #10985 from jfrazelle/add-tools-doc
add tools doc
Upstream-commit: 7d62ebf278cefb23ed181f74f264763995029e77
Component: engine
2015-02-24 13:13:45 -08:00
3e98bd7359 Merge pull request #10984 from thaJeztah/do-re-mi
Order maintainers alphabetically
Upstream-commit: aa2b3c668b03aea11b31753672a4d72fb1222d99
Component: engine
2015-02-24 13:13:08 -08:00
7af3890cce Merge pull request #10988 from ahmetalpbalkan/TestBuildAddBadLinks-leftover-rm
Remove leftover debugging artifact in test
Upstream-commit: 3b484c95542f3018fb24b7a0d26a0fe0c4da063c
Component: engine
2015-02-24 12:47:55 -08:00
d5ee9d6913 Remove leftover debugging artifact in test
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: e9e993922d3173a292d4caaf35cb913ddc494f0c
Component: engine
2015-02-24 11:44:14 -08:00
a9eaa4b1bb add tools doc
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Upstream-commit: e63a693c6d4ae76cded0029bb7f60216c4b11da6
Component: engine
2015-02-24 11:05:05 -08:00
59d825b194 Merge pull request #10982 from msabramo/CONTRIBUTING_tweaks
CONTRIBUTING.md: punctuation fixes
Upstream-commit: d0bc3537d7cc7f152842c7d21c9eae85e0a95a4c
Component: engine
2015-02-24 10:02:58 -08:00
c52be4e77a Re-order maintainers
Because they should be ordered alphabetically.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 681182ea7a45b513430c84484d8aa2c0c42514e5
Component: engine
2015-02-24 17:49:03 +01:00
5e3eccc909 CONTRIBUTING.md: punctuation fixes
Signed-off-by: Marc Abramowitz <marc@marc-abramowitz.com>
Upstream-commit: 301b3ffbbb6660a16096e68a942e8d5b073893e3
Component: engine
2015-02-24 08:21:49 -08:00
bddb299991 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>
Upstream-commit: d96e8853145ed6a03529e093c49b91f0053472a6
Component: engine
2015-02-24 15:52:47 +01:00
86eef40206 Merge pull request #10724 from SvenDowideit/takeover-10470
Update best practices for entrypoint.
Upstream-commit: 1d27930faaacf6ebe4553c7b23087e2164816470
Component: engine
2015-02-24 15:32:16 +10:00
351cb675a4 Merge pull request #10923 from bradleywright/patch-1
Fix erroneously wrapped URLs in links
Upstream-commit: ad2063ca8461a903fe993188b4dbaa5da804a72b
Component: engine
2015-02-24 15:31:40 +10:00
61ee3dd26f Merge pull request #10929 from thaJeztah/docs-optimize-images
docs: optimize and consolidate images, remove duplicates
Upstream-commit: e500c00d7cd855c02f390d1f9d55b668cc191854
Component: engine
2015-02-24 15:31:00 +10:00
d0efcb1132 Merge pull request #10973 from crosbymichael/phil-maintainer
Add Phil Estes as a core maintainer
Upstream-commit: 347a418f35b26293d317276b9481e89941e2cf7a
Component: engine
2015-02-23 19:24:22 -08:00
a6d4aa225d 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>
Upstream-commit: 30ede3632427338b4a80bdc0c4dac3d6fac630a1
Component: engine
2015-02-23 17:07:12 -08:00
eadcf24d19 Merge pull request #10936 from vincentbernat/fix/zsh-completion-update-3
zsh: update zsh completion for docker command
Upstream-commit: 09c4b4571225852692c1ac1beb8e9fe5209a62be
Component: engine
2015-02-23 16:01:59 -08:00
f3462cd410 Merge pull request #10933 from ahmetalpbalkan/version-daemon-os-arch
cli: Add server OS/Arch info to 'version' cmd
Upstream-commit: 02c888159666ee53df9eeb1397c7d597dabf3b60
Component: engine
2015-02-23 15:26:53 -08:00
10829092be Merge pull request #10908 from duglin/EnvDollarTest
Add a ENV tests with special chars in the values
Upstream-commit: fd185eddf625e810f6cb707df9297e4dfd70b7d0
Component: engine
2015-02-23 15:25:31 -08:00
5ac832ddd3 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>
Upstream-commit: 33fa1978799599f48694680ad6f73b7ecfaa924d
Component: engine
2015-02-24 00:16:30 +01:00
e430471f3b Merge pull request #10921 from duglin/FixNonverboseBuild
Build w/o verbose hangs w/RUN
Upstream-commit: ac06d0c46a26192c34a3ed782514652895fe5447
Component: engine
2015-02-23 15:15:12 -08:00
045a33063d Merge pull request #10938 from thaJeztah/update-copyright-year-in-notice
Update copyright year in NOTICE
Upstream-commit: b27bb2f255f60ce08d8d7b960f62027f7139c6e5
Component: engine
2015-02-23 15:12:38 -08:00
bbc9585570 Merge pull request #10925 from brahmaroutu/pkgdependency_10922
Removing dependencies from pkg into Docker internal code
Upstream-commit: 8f3ecf8779fd450d63049f53f65899d41cf759d6
Component: engine
2015-02-23 14:49:19 -08:00
4fbdef753d cli: Add server OS/Arch info to 'version' cmd
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 3346c2e4d9ce0cf92b056b6ddc883adf5b8beddd
Component: engine
2015-02-23 14:32:25 -08:00
ebe794aef1 Merge pull request #10889 from ahmetalpbalkan/win-cli/SameHostDaemon-skips
integration-cli: Skip tests which require daemon/cli to be on the same host
Upstream-commit: f6100a5d9d4354b41dbd5ca7b883cae24603172e
Component: engine
2015-02-23 14:28:06 -08:00
1ec0d5c050 Merge pull request #10948 from kookster/patch-1
Have docker command use $HOME instead of '/Users/mary'
Upstream-commit: 66315f48e55ef2d82d4d9597041bd0e81f78b7ab
Component: engine
2015-02-23 14:27:42 -08:00
f24c530c74 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>
Upstream-commit: b686b65c9b5f5eabc7a618faf0055aff06e4c0c4
Component: engine
2015-02-23 14:08:05 -08:00
56f9de6d23 Merge pull request #10926 from cpuguy83/10685_check_nil_volume
Check nil volume on mount init
Upstream-commit: ae9001fbdc251a455a7e59475b2a40b54d2fbd96
Component: engine
2015-02-23 13:55:38 -08:00
3aaa63fb85 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>
Upstream-commit: 44adbf23b5476ce26f807f956a21f27f07311a10
Component: engine
2015-02-23 14:12:44 -07:00
1c2ec47a40 Merge pull request #10954 from icecrime/update_release_checklist
Update RELEASE-CHECKLIST.md
Upstream-commit: 83bf0ac96d0ce41c4f74735a7a17a71641f7ac2f
Component: engine
2015-02-23 12:20:04 -08:00
8cccb488d5 Merge pull request #10951 from tianon/fix-dynbinary
Fix dynbinary with new autogen code
Upstream-commit: 3562997296a8ba3538390afdffcc531da62ab598
Component: engine
2015-02-23 12:08:17 -08:00
216293ecdf Merge pull request #10887 from lkinley/master
Patch mkimage-yum.sh to work with Amazon Linux (2014.09)
Upstream-commit: acda41e7c3999d1aca0a3298f87e219873fb2f4e
Component: engine
2015-02-23 11:43:12 -08:00
55586c529d Update RELEASE-CHECKLIST.md
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: d1b515dcc5a2a57610aaab54a27fbee321d355d1
Component: engine
2015-02-23 11:34:22 -08:00
ded807afc8 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>
Upstream-commit: ed3bc3b9864dff42a7949aa9202ea242e9ed0a9b
Component: engine
2015-02-23 11:31:38 -08:00
bdb65abebf Removing dependencies from pkg into Docker internal code
Closes #10922

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 7a9c944b827dc0cd416d701fe6460264f05166bb
Component: engine
2015-02-23 18:43:10 +00:00
6e5fd6595f Fix dynbinary with new autogen code
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: a936ea88dab9751250a51b6e32ee4e7aa57d8e9d
Component: engine
2015-02-23 11:19:51 -07:00
7e8d8b3922 Merge pull request #10698 from crosbymichael/issue-triage
Add issue triage document
Upstream-commit: e82cf741e3d1cf0990836ea1112ff6e1edfa680f
Component: engine
2015-02-23 10:18:04 -08:00
27d91a55a2 Have docker command use $HOME instead of 'mary'
Signed-off-by: Andrew Kuklewicz <andrew@beginsinwonder.com>
Upstream-commit: f9bb0afc6c37ea5b6f2d413474c5dcbdd84259f1
Component: engine
2015-02-23 12:37:11 -05:00
d3f0aa2c72 Merge pull request #10945 from delftswa2014/daemon-rm
Rename Daemon.Destroy to Daemon.Rm to be consistent with CLI command.
Upstream-commit: 05ba127f060a1e9fee819e15bef300d56ddda1cf
Component: engine
2015-02-23 09:22:58 -08:00
a23c3ea95a Rename Destroy to Rm to be consistent with CLI.
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
Upstream-commit: ba93f8316ce796ebeee62f704f8311af8b9f250a
Component: engine
2015-02-23 16:15:56 +01:00
b907fd6bb4 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>
Upstream-commit: 743f0bcc83b0b1b8ccc1980300e96a9003b5cd0f
Component: engine
2015-02-23 12:10:54 +01:00
f1c26b077c Merge pull request #10918 from cpuguy83/10278_fix_create_docs_for_volumes
Remove CLI doc entry related to API-only function
Upstream-commit: 7d2188f9955d3f2002ff8c2e566ef84121de5217
Component: engine
2015-02-22 18:11:18 -08:00
402ab2a4ba a little re-writing
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 3c9d45e2130e86c45da94aa00ce9a75e0d514e61
Component: engine
2015-02-23 12:00:50 +10:00
59491a1c4b 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)
Upstream-commit: 6009f2eac4d8d707b64bfada507345e11977643d
Component: engine
2015-02-23 12:00:50 +10:00
654aabd54a Merge pull request #10927 from hyp3rdino/patch-1
Update mac.md
Upstream-commit: bac58e971104bf375bf241913747e1d98dadf2cf
Component: engine
2015-02-22 20:39:53 -05:00
cd135d371f Merge pull request #10930 from caryhartline/patch-1
Fix three spelling mistakes
Upstream-commit: 74394f03ac422fe79c049f37c469fdceac078ff7
Component: engine
2015-02-22 20:28:42 -05:00
7735397fed Merge pull request #10942 from sdreyesg/patch-1
"docker run hello-world" instead of "docker hello-world"
Upstream-commit: e8484a34385d8e3652f820dd4be89e4b9c4b72d1
Component: engine
2015-02-22 20:28:19 -05:00
45c1ee2250 Merge pull request #10941 from dottorblaster/master
New padding-right for the docs' left navigation
Upstream-commit: c23d0805bb6827c38a3f4f973b0d2592f19d2532
Component: engine
2015-02-22 20:27:55 -05:00
95592a5ea0 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>
Upstream-commit: f37351f9e88e077b2a1b219cd412e781ebb2ef9c
Component: engine
2015-02-22 14:51:32 -08:00
98b2a68b5d correcting a little visual bug
padding right: 10px; for #leftnav li

Signed-off-by: Alessio Biancalana <dottorblaster@gmail.com>
Upstream-commit: 47a847bca8aa91f55c6b18c726bd4a6d960322d1
Component: engine
2015-02-22 22:59:41 +01:00