1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
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
Evan Hazlett
e450a75be4 virtualbox: check state before attempting start
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-24 09:45:44 -05:00
Evan Hazlett
18b58b4601 Merge pull request #594 from sthulb/iso-paths
Move images dir to stop polluting the docker path
2015-02-24 09:32:21 -05:00
Evan Hazlett
839688ecb1 Merge pull request #595 from ehazlett/roadmap
update roadmap
2015-02-24 09:22:12 -05:00
Evan Hazlett
f124a21cbd update roadmap
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-24 09:21:31 -05:00
Simon Thulbourn
52782250d3 Move images dir to stop polluting the docker path
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-02-24 14:11:18 +00:00
Aanand Prasad
8076c7d7fe Merge pull request #1010 from bfirsh/add-create-message-when-scaling-containers
Log "creating container" when scaling
2015-02-24 14:09:12 +00:00
Ben Firshman
b2425c1f1e Log "creating container" when scaling
If an image needs pulling, it just looks like it's hanging.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-02-24 13:39:38 +00:00
Aanand Prasad
34c6920b37 Point at official Docker install instructions rather than repeating them
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-24 11:43:14 +00: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
Ben Firshman
d80a28c675 Merge pull request #585 from ehazlett/command-docs
add better docs to command help
2015-02-24 10:48:39 +00:00
Ben Firshman
8d8dd37d2c Merge pull request #924 from aanand/update-contributing
Add checklist item for completion script URL to CONTRIBUTING.md
2015-02-24 10:44:16 +00:00
Ben Firshman
b1739e703b Merge pull request #1002 from SvenDowideit/add-links-to-references
Add links to the main Compose references
2015-02-24 10:43:34 +00: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
Victor Vieux
05d7b085cc Merge pull request #411 from SvenDowideit/build-docs-in-local-swarm-repo
add ./script/doc to build swarm documentation using the docs.docker.com tooling
2015-02-23 18:44:38 -08:00
Sven Dowideit
11b2121105 add ./script/doc to build swarm documentation using the docs.docker.com tooling
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-24 12:12:23 +10:00
Jeffrey Morgan
6223df9ae4 Merge pull request #199 from kitematic/report-issue
Basic issue reporting from Help menu
2015-02-23 20:19:24 -05:00
Jeffrey Morgan
e18814afee Basic issue reporting from Help menu 2015-02-23 20:09:09 -05: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
Victor Vieux
2f23f98bee Merge pull request #410 from bfirsh/tweak-docs-introduction
Tweak docs introduction
2015-02-23 16:02:07 -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
Jeffrey Morgan
244e9730e4 Merge pull request #198 from kitematic/fix-upgrading
Fix upgrading
2015-02-23 18:48:26 -05:00
Jeffrey Morgan
9a85ee83d3 Did not => didn't 2015-02-23 18:43:45 -05:00
Jeffrey Morgan
b2c44045c8 Unpacked => Installed 2015-02-23 18:43:05 -05:00
Stephen Day
47a8ad7a61 Merge pull request #196 from fkautz/pr_out_removing_dependencies_from_makefile_authors_target_that_break_build_in_pristine_git_env
Removing dependencies from Makefile AUTHORS target that break build in pristine git env
2015-02-23 15:31:41 -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
Frederick F. Kautz IV
65450aca98 Removing dependencies from Makefile AUTHORS target that break build in pristine git env
Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
2015-02-23 15:11:04 -08:00
Jeffrey Morgan
489bc990b1 Create ROADMAP.md 2015-02-23 17:53:01 -05: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
Ben Firshman
a42f2007ea Merge pull request #1001 from SvenDowideit/build-docs-in-local-fig-repo
add ./script/doc to build fig documentation using the docs.docker.com to...
2015-02-23 22:45:59 +00: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
Evan Hazlett
979ec61f1a update docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-23 17:29:55 -05: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
Evan Hazlett
54f36078f4 do not show debug for docker install by default; refactor install out of drivers
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-23 17:14:32 -05: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
Evan Hazlett
5a5e8692fe Merge pull request #591 from ehazlett/no-error-for-ls
do not error with no active host for ls
2015-02-23 17:01:21 -05: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
Stephen Day
0713e1c4b2 Merge pull request #195 from fkautz/pr_out_fixing_build_godeps_entry_for_github_com_msopentech_azure_sdk_for_go_was_pointing_to_the_wrong_location
Fixing build, GoDeps entry for github.com/MSOpenTech/azure-sdk-for-go was pointing to the wrong location
2015-02-23 13:51:15 -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
Jeffrey Morgan
c9d08b2e5b Merge branch 'master' into fix-downloading 2015-02-23 15:38:44 -05:00
Jeffrey Morgan
2345bf7d89 Fix upgrading virtual box if existing boot2docker vm is running 2015-02-23 15:38:31 -05:00
Evan Hazlett
b5ca626957 Merge pull request #574 from nathanleclaire/unset
Add docker-machine env unset
2015-02-23 15:30:00 -05:00