toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,596 Commits 3 Branches 295 Tags
5a21254417f240a8faec5b0cc7338682d4c4bdc4
Commit Graph
13596 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
moxiegirl 5a21254417 Merge pull request #11232 from estesp/localhost-resolv-docs 
Add information on resolv.conf localhost filtering to networking.md
Upstream-commit: 5cbe6820e2a837e2442c0d70d13efcb2a4f81803
Component: engine
 2015-03-09 11:32:38 -07:00
Tianon Gravi 3a84d64ca0 Merge pull request #11251 from coolljt0725/add_ulimit_to_bash_completion 
Add --ulimit and --default-ulimit to bash completion
Upstream-commit: 228449b631f3dae41f5cb1e333aa226842f0ea49
Component: engine
 2015-03-09 11:30:42 -07:00
Arnaud Porterie ce24630e9e Merge pull request #11123 from jlhawn/pull_tempfile_copy_log_error 
Check for error when copying v2 image blob to temp
Upstream-commit: 2e518bc831f24a8b3277618b574fe1cd4c97bfa1
Component: engine
 2015-03-09 11:14:03 -07:00
Tibor Vass ec860209f1 Merge pull request #11260 from jfrazelle/carry-domain-255 
Restrict domain name to 255 characters
Upstream-commit: 6ffc57ad5c8233bcc1360ec73096cc5049ed4062
Component: engine
 2015-03-09 14:09:37 -04:00
Phil Estes c4e98d23c7 Add information on resolv.conf localhost filtering to networking.md 
This patch adds detail on how the host's `/etc/resolv.conf` file is
filtered when creating the copy for the container.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: b32bf64f6f3cc09334f52a08a4449a109ad123ff
Component: engine
 2015-03-09 13:41:00 -04:00
Tomáš Hrčka a759954739 Restrict domain name to 255 characters 
Signed-off-by: Tomáš Hrčka <thrcka@redhat.com>

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Upstream-commit: b2f05c220721d5ef9a31fc259e3f6c2c057ab4ab
Component: engine
 2015-03-09 10:14:56 -07:00
Jessie Frazelle 79aa6db88c Merge pull request #10896 from albers/bash-completion 
Update Bash completion for docker events
Upstream-commit: 6135ec89ad41bbf4ebf6af3b8830c0f332ac30c2
Component: engine
 2015-03-09 10:02:50 -07:00
moxiegirl e209023d26 Merge pull request #11227 from coolljt0725/fix_start_help_message 
Fix docker start help message
Upstream-commit: b85c137f1d8c7d803653cab43c886a3c5d7e3f02
Component: engine
 2015-03-09 09:54:36 -07:00
moxiegirl 943c9020e9 Merge pull request #11177 from duglin/10805-cp-to-stdot 
Add support for 'docker cp' to write to stdout
Upstream-commit: 8b516bf5ce85641095378ed8900aa63f0f32a619
Component: engine
 2015-03-09 09:51:48 -07:00
moxiegirl ea31e8cf4b Merge pull request #11213 from SvenDowideit/example-of-how-to-drive-s3-manually 
Show how to remove a file from the docs s3 bucket, and then invalidate t...
Upstream-commit: da5155a1ad502ff9270c7806f389abd6ea6e2a31
Component: engine
 2015-03-09 09:50:47 -07:00
moxiegirl a3b4760c40 Merge pull request #11146 from SvenDowideit/takeover-11126 
fix to cpu.shares documentation by @hqhq
Upstream-commit: 08211aab57cf6891a845d8e7a7020e203ae2812d
Component: engine
 2015-03-09 09:48:33 -07:00
Alexander Morozov 285e8de3b3 Merge pull request #11216 from ahmetalpbalkan/win-cli/TestCliProxyDisableProxyUnixSock-fix 
integ-cli: skip test assuming -H is unix://...
Upstream-commit: 057c5e6aa9eb312cd78d5c906ae7bbad98f57e36
Component: engine
 2015-03-09 09:09:52 -07:00
Alexander Morozov 102aaf6e25 Merge pull request #11219 from icecrime/remove_maintainers_files 
Remove subdirectories MAINTAINERS files
Upstream-commit: c5f9aa18f4a09a0ab6743d1e7c2de1ee355461cc
Component: engine
 2015-03-09 09:02:58 -07:00
Lei Jitang 3d373cfc0f Add --ulimit and --default-ulimit to bash completion 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: fb25a2f2aa757bbb96892cdac6db79049c253603
Component: engine
 2015-03-09 20:36:09 +08:00
Phil Estes b3c11decb8 Merge pull request #11225 from coolljt0725/show_error_message 
Add docker start show error message form daemon when start failed
Upstream-commit: 93e78ac8e7a0d4d08638ae4a7cd987505915cfb9
Component: engine
 2015-03-08 14:39:40 -04:00
Lei Jitang d549c28940 Fix docker start muliple containers continue on one failed and 
add docker start show error message from daemon when start failed

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2a5a50dca7dc56d390a70c0258ac1b8df3cd4d94
Component: engine
 2015-03-08 13:44:25 +08:00
Tibor Vass f84b953b72 Merge pull request #10813 from chenhanxiao/expose-warning-v2 
dispatchers: warn user if try to use EXPOSE ip:hostPort:containerPort
Upstream-commit: 1ff904e045c9415bb6d109742cd7f78316d44fa6
Component: engine
 2015-03-08 00:30:27 -05:00
moxiegirl 5e4626dc42 Merge pull request #11231 from thaJeztah/docs-contribute-to-project-fixups-alternative 
Cleanup: new project docs fix-ups (alternative) Merging without another LGTM as it only includes line breaks and the bday stuff is moving fast.
Upstream-commit: e5ff907e0c2e23782e6082b41891bdded8834430
Component: engine
 2015-03-07 19:17:33 -08:00
Sebastiaan van Stijn d5e3b94455 Cleanup: new project docs fix-ups (alternative) 
This cleans up the recently added project docs and
fixes some minor issues.

- remove inline styles where possible
- add redirects for renamed/replaced documents
- add styles for GitHub labels to match the style on GitHub
- fix minor markdown issues causing some code-blocks
  to be shown as text
- wrap the documents to 80-chars
- use 4 spaces in stead of tabs for identing and remove
  trailing whitespace/redundant blank lines
- optimized 'gordon' image

NOTE:
This alternative commit/PR re-introduces some inline
styles because the docs/base image has not yet been
updated for the current docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: efc625fcd00b0f76e484d0bc081bafcfd789cfbb
Component: engine
 2015-03-07 23:40:34 +01:00
Doug Davis a67e12d0d3 Merge pull request #11212 from cpuguy83/better_error_message_for_tls_issues 
Improve error messages for loading tls keys
Upstream-commit: 6f0733a9e3ea96af823e750ff67925b05b6b4e33
Component: engine
 2015-03-07 16:47:16 -05:00
Doug Davis e5a57288ab Merge pull request #11223 from ahmetalpbalkan/win-cli/preserve-SYSTEMROOT 
integ-cli: also preserve SystemRoot env var
Upstream-commit: 7967fc8119009d271b18d7aaf6ad0309a6bbd6d5
Component: engine
 2015-03-07 14:07:44 -05:00
Lei Jitang 143601c86b Fix docker start help message 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3c37f88aff42c1d900d18d1a8c81fc857e650d44
Component: engine
 2015-03-07 20:45:46 +08:00
Ahmet Alp Balkan de1d7d8288 integ-cli: also preserve SystemRoot env var 
Windows CI fails to dial remote test host over tcp in the test cases where
we clear environment variables during `exec(dockerBinary, ...)` in the
absence of `SystemRoot` environment variable (typically points to `c:\windows`).

This fixes tests:
- `TestRunEnvironmentErase`
- `TestRunEnvironmentOverride`

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: d18689dff71ccbc3b955a4416ae04077356fd5c9
Component: engine
 2015-03-07 01:09:01 -08:00
moxiegirl f757146875 Merge pull request #11097 from thaJeztah/11069-run-reference-restart-policies 
Docs: add restart-policies to 'Run reference'
Upstream-commit: faa6fd40f436587999e24b0f5c3369c007a6c482
Component: engine
 2015-03-06 22:08:29 -08:00
Arnaud Porterie 5506a9a27c Remove subdirectories MAINTAINERS files 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 89bdaa35e04b74b7c6528783e0f7b8154b2a3d31
Component: engine
 2015-03-06 18:21:51 -08:00
Josh Hawn 1d55bf7466 Check for error when copying v2 image blob to temp 
The call to io.Copy was not being checked for errors at a critical point in the
pull logic. This patch will log the error value if not nil.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 6564e0ad2f63257458a5bad68f47504223b00285
Component: engine
 2015-03-06 18:03:39 -08:00
Brian Goff 1c4e8d93e0 Improve error messages for loading tls keys 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2ea6c2c264f0f43beb877a83aea3e6e6ad38ae5d
Component: engine
 2015-03-06 20:40:09 -05:00
Arnaud Porterie 968e4c89bb Merge pull request #10425 from dmcgowan/registry-maintainers 
Add distribution maintainers to maintainers files
Upstream-commit: a59b6f4ce616aeae7d711461a58566f3d4919480
Component: engine
 2015-03-06 17:37:12 -08:00
Phil Estes 4fbcc1c55f Merge pull request #11119 from tianon/busybox-from-hub 
Download busybox from the Hub instead of GitHub
Upstream-commit: 2aab992e175c0ddee7a248c5a1d6ece43466b253
Component: engine
 2015-03-06 18:01:43 -05:00
Ahmet Alp Balkan 117e3c860a integ-cli: skip test assuming -H is unix://... 
`TestCliProxyDisableProxyUnixSock` verifies that HTTP_PROXY env var is
used when DOCKER_HOST is not set and cli connects to `unix://...` by
default.

In the windows/darwin CLI CIs, daemon is on remote host and we always
connect via `tcp://`, therefore this test fails very straight. Skipping
this test to run only on "same host daemon" assumption.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: f6f2bad7ea5ca642a261df4d8a0ddb43d09bda62
Component: engine
 2015-03-06 14:45:26 -08:00
moxiegirl 379d4efef1 Merge pull request #11209 from moxiegirl/contribute-update 
Contribute update to Project
Upstream-commit: 7924acf4205f3cb17d348c117cbf0db7d9f219fd
Component: engine
 2015-03-06 14:40:49 -08:00
Mary Anthony c42f7eda7c Fixing two bad files that got borked in the last rebase 
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: efde5ec9bea6ec6ea17a162a0031839b9a58392a
Component: engine
 2015-03-06 14:21:17 -08:00
Mary Anthony 9eb8a0214c Rewrite the Contributing tree as Project in preparation for the Docker birthday. 
Signed-off-by: Mary Anthony <mary.anthony@docker.com>

Optimize images, remove old file, add metadata tagging

Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: 8c575f263dff23bec76dd0aa169e278fe4bfcb74
Component: engine
 2015-03-06 14:10:55 -08:00
Sven Dowideit ef927156e0 Show how to remove a file from the docs s3 bucket, and then invalidate the cloudflare cache 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: d1dc24e5db27f7a77458898ceb6be27a9acf01da
Component: engine
 2015-03-06 14:05:26 -08:00
Sven Dowideit eb845a4592 Merge pull request #11195 from ahmetalpbalkan/doc/remote-api-kind 
doc/api: explain Kind (ChangeType)
Upstream-commit: e058b7980d6ddf09fac8ef68d806dcc26e63e264
Component: engine
 2015-03-07 07:19:29 +10:00
Phil Estes b507131b2a Merge pull request #11202 from coolljt0725/fix_start_hijacked 
Fix start container failed hijack the stdin of terminal
Upstream-commit: cfe5767045745a7453bc7b74d4ce684ff4270162
Component: engine
 2015-03-06 13:48:02 -05:00
moxiegirl 405e3e2f5f Merge pull request #11204 from duglin/VolumeDocs 
Tell users about how VOLUME initializes the new mount point/volume
Upstream-commit: 55fc7f5c9d3bb0e03e76b62c2ff0123a20d5e3c7
Component: engine
 2015-03-06 10:44:03 -08:00
Tibor Vass 8b5893c4a0 Merge pull request #11186 from ahmetalpbalkan/win-cli/TestBuild-case-sensitive-fix 
integ-cli: skip case-sensitive dockerfile tests on windows
Upstream-commit: ecea4a9cc2ddc3e7af5ff3193548e0e8c36b528f
Component: engine
 2015-03-06 13:43:01 -05:00
Phil Estes b803f84438 Merge pull request #10675 from brahmaroutu/events_filterbyimage_10645 
Allow use of just image name without the tag
Upstream-commit: c94eb28af02c85529cd54342c6ad4fe05120005b
Component: engine
 2015-03-06 13:38:41 -05:00
Tianon Gravi f7ded4886e Merge pull request #11196 from ahmetalpbalkan/win-cli/TestRunCidFileCleanupIfEmpty-fix 
integ-cli: fix test requiring scratch
Upstream-commit: f5538dc3bc42ac3f41fb9bd6cd4da6392b6c1903
Component: engine
 2015-03-06 11:32:35 -07:00
Doug Davis ed2fc0acb0 Tell users about how VOLUME initializes the new mount point/volume 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 9be2ca2394112d8e988dc492f482cefd93a5b5fb
Component: engine
 2015-03-06 10:25:47 -08:00
Tibor Vass a0c6b78604 Merge pull request #11148 from ahmetalpbalkan/win-cli/chmod-x-fix 
pkg/archive: adjust chmod bits on windows
Upstream-commit: a6ddb8de42c731ae8f9e0e1becc2a93a56158a58
Component: engine
 2015-03-06 12:28:58 -05:00
Lei Jitang 75ac7aea87 Fix start container failed hijack the stdin of terminal 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 518fdf972d874a9fd0e1af739ffc978c6b39e126
Component: engine
 2015-03-06 09:06:14 -08:00
Ahmet Alp Balkan ddfd7a9478 integ-cli: fix test requiring scratch 
TestRunCidFileCleanupIfEmpty fails on windows/mac because the test runs
the command `docker run scratch` and it gives the following error:

	Unable to find image 'scratch:latest' locally
	Pulling repository scratch
	511136ea3c5a: Download complete
	FATA[0004] 'scratch' is a reserved name

I am not entirely sure if this is a test issue or not but I had a quick
workaround by creating another image using `FROM scratch` and using that.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 3a70f9d422e2d47dad0d8d5825832dd7f85f049a
Component: engine
 2015-03-06 08:52:40 -08:00
Phil Estes 15d2732f17 Merge pull request #11122 from tianon/simple-dockerfile 
Add secondary "simple" Dockerfile
Upstream-commit: dd3746973e61212537ac3d63039e3b4f1f8ebfea
Component: engine
 2015-03-06 11:52:07 -05:00
Jessie Frazelle 7102f6d766 Merge pull request #11175 from coolljt0725/fix_build_bash_completion 
Fix docker build -f bash completion and docker run bash completion
Upstream-commit: aa1dce8edaf337210c7acd9da3e7406852547f50
Component: engine
 2015-03-06 15:53:48 +00:00
Lei Jitang b1cab115d7 Fix docker build and docker run bash completion 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 00d3727106ef4d1280175a135b36b80c8bfc6a7b
Component: engine
 2015-03-06 15:35:52 +08:00
Ahmet Alp Balkan cc2fe887e1 remote api: explain Kind (ChangeType) 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 957bc8ac50ee4e2498143fca7848b4ccaab6147a
Component: engine
 2015-03-05 19:39:14 -08:00
Doug Davis b01ab36e3f Merge pull request #11189 from ahmetalpbalkan/win-cli/archive-path-separator 
pkg/archive_windows: make use of os.PathSeparator
Upstream-commit: 2a8a2d24285b40cf450f10dcb174dbef50e276ad
Component: engine
 2015-03-05 22:25:20 -05:00
Tibor Vass 00189f3e5a Merge pull request #11125 from moypray/http_proxy 
docker info display http/https_proxy setting
Upstream-commit: 94fca50de05aac4d4a588e9410fb3234045ff844
Component: engine
 2015-03-05 20:26:20 -05:00