Tibor Vass
02e0a23d80
Merge pull request #10423 from dmcgowan/v2-registry-fix-single-names
...
Allow single name component repository names
2015-03-09 15:40:22 -04:00
moxiegirl
5cbe6820e2
Merge pull request #11232 from estesp/localhost-resolv-docs
...
Add information on resolv.conf localhost filtering to networking.md
2015-03-09 11:32:38 -07:00
Tianon Gravi
228449b631
Merge pull request #11251 from coolljt0725/add_ulimit_to_bash_completion
...
Add --ulimit and --default-ulimit to bash completion
2015-03-09 11:30:42 -07:00
Arnaud Porterie
2e518bc831
Merge pull request #11123 from jlhawn/pull_tempfile_copy_log_error
...
Check for error when copying v2 image blob to temp
2015-03-09 11:14:03 -07:00
Tibor Vass
6ffc57ad5c
Merge pull request #11260 from jfrazelle/carry-domain-255
...
Restrict domain name to 255 characters
2015-03-09 14:09:37 -04:00
Phil Estes
b32bf64f6f
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)
2015-03-09 13:41:00 -04:00
Tomáš Hrčka
b2f05c2207
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)
2015-03-09 10:14:56 -07:00
Jessie Frazelle
6135ec89ad
Merge pull request #10896 from albers/bash-completion
...
Update Bash completion for docker events
2015-03-09 10:02:50 -07:00
moxiegirl
b85c137f1d
Merge pull request #11227 from coolljt0725/fix_start_help_message
...
Fix docker start help message
2015-03-09 09:54:36 -07:00
moxiegirl
8b516bf5ce
Merge pull request #11177 from duglin/10805-cp-to-stdot
...
Add support for 'docker cp' to write to stdout
2015-03-09 09:51:48 -07:00
moxiegirl
da5155a1ad
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...
2015-03-09 09:50:47 -07:00
moxiegirl
08211aab57
Merge pull request #11146 from SvenDowideit/takeover-11126
...
fix to cpu.shares documentation by @hqhq
2015-03-09 09:48:33 -07:00
Alexander Morozov
057c5e6aa9
Merge pull request #11216 from ahmetalpbalkan/win-cli/TestCliProxyDisableProxyUnixSock-fix
...
integ-cli: skip test assuming -H is unix://...
2015-03-09 09:09:52 -07:00
Alexander Morozov
c5f9aa18f4
Merge pull request #11219 from icecrime/remove_maintainers_files
...
Remove subdirectories MAINTAINERS files
2015-03-09 09:02:58 -07:00
Lei Jitang
fb25a2f2aa
Add --ulimit and --default-ulimit to bash completion
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-03-09 20:36:09 +08:00
Phil Estes
93e78ac8e7
Merge pull request #11225 from coolljt0725/show_error_message
...
Add docker start show error message form daemon when start failed
2015-03-08 14:39:40 -04:00
Lei Jitang
2a5a50dca7
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 >
2015-03-08 13:44:25 +08:00
Tibor Vass
1ff904e045
Merge pull request #10813 from chenhanxiao/expose-warning-v2
...
dispatchers: warn user if try to use EXPOSE ip:hostPort:containerPort
2015-03-08 00:30:27 -05:00
moxiegirl
e5ff907e0c
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.
2015-03-07 19:17:33 -08:00
Sebastiaan van Stijn
efc625fcd0
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 >
2015-03-07 23:40:34 +01:00
Doug Davis
6f0733a9e3
Merge pull request #11212 from cpuguy83/better_error_message_for_tls_issues
...
Improve error messages for loading tls keys
2015-03-07 16:47:16 -05:00
Doug Davis
7967fc8119
Merge pull request #11223 from ahmetalpbalkan/win-cli/preserve-SYSTEMROOT
...
integ-cli: also preserve SystemRoot env var
2015-03-07 14:07:44 -05:00
Lei Jitang
3c37f88aff
Fix docker start help message
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-03-07 20:45:46 +08:00
Ahmet Alp Balkan
d18689dff7
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 >
2015-03-07 01:09:01 -08:00
moxiegirl
faa6fd40f4
Merge pull request #11097 from thaJeztah/11069-run-reference-restart-policies
...
Docs: add restart-policies to 'Run reference'
2015-03-06 22:08:29 -08:00
Arnaud Porterie
89bdaa35e0
Remove subdirectories MAINTAINERS files
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-03-06 18:21:51 -08:00
Derek McGowan
a0ca9190cc
Allow single name component repository names
...
Private registries should support having images pushed with only a single name component (e.g. localhost:5000/myapp).
The public registry currently requires two name components, but this is already enforced in the registry code.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-03-06 18:18:53 -08:00
Josh Hawn
6564e0ad2f
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)
2015-03-06 18:03:39 -08:00
Brian Goff
2ea6c2c264
Improve error messages for loading tls keys
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-03-06 20:40:09 -05:00
Arnaud Porterie
a59b6f4ce6
Merge pull request #10425 from dmcgowan/registry-maintainers
...
Add distribution maintainers to maintainers files
2015-03-06 17:37:12 -08:00
Phil Estes
2aab992e17
Merge pull request #11119 from tianon/busybox-from-hub
...
Download busybox from the Hub instead of GitHub
2015-03-06 18:01:43 -05:00
Ahmet Alp Balkan
f6f2bad7ea
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 >
2015-03-06 14:45:26 -08:00
moxiegirl
7924acf420
Merge pull request #11209 from moxiegirl/contribute-update
...
Contribute update to Project
2015-03-06 14:40:49 -08:00
Mary Anthony
efde5ec9be
Fixing two bad files that got borked in the last rebase
...
Signed-off-by: Mary Anthony <mary.anthony@docker.com >
2015-03-06 14:21:17 -08:00
Mary Anthony
8c575f263d
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 >
2015-03-06 14:10:55 -08:00
Sven Dowideit
d1dc24e5db
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 >
2015-03-06 14:05:26 -08:00
Sven Dowideit
e058b7980d
Merge pull request #11195 from ahmetalpbalkan/doc/remote-api-kind
...
doc/api: explain Kind (ChangeType)
2015-03-07 07:19:29 +10:00
Phil Estes
cfe5767045
Merge pull request #11202 from coolljt0725/fix_start_hijacked
...
Fix start container failed hijack the stdin of terminal
2015-03-06 13:48:02 -05:00
moxiegirl
55fc7f5c9d
Merge pull request #11204 from duglin/VolumeDocs
...
Tell users about how VOLUME initializes the new mount point/volume
2015-03-06 10:44:03 -08:00
Tibor Vass
ecea4a9cc2
Merge pull request #11186 from ahmetalpbalkan/win-cli/TestBuild-case-sensitive-fix
...
integ-cli: skip case-sensitive dockerfile tests on windows
2015-03-06 13:43:01 -05:00
Phil Estes
c94eb28af0
Merge pull request #10675 from brahmaroutu/events_filterbyimage_10645
...
Allow use of just image name without the tag
2015-03-06 13:38:41 -05:00
Tianon Gravi
f5538dc3bc
Merge pull request #11196 from ahmetalpbalkan/win-cli/TestRunCidFileCleanupIfEmpty-fix
...
integ-cli: fix test requiring scratch
2015-03-06 11:32:35 -07:00
Doug Davis
9be2ca2394
Tell users about how VOLUME initializes the new mount point/volume
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-03-06 10:25:47 -08:00
Tibor Vass
a6ddb8de42
Merge pull request #11148 from ahmetalpbalkan/win-cli/chmod-x-fix
...
pkg/archive: adjust chmod bits on windows
2015-03-06 12:28:58 -05:00
Lei Jitang
518fdf972d
Fix start container failed hijack the stdin of terminal
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-03-06 09:06:14 -08:00
Ahmet Alp Balkan
3a70f9d422
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 >
2015-03-06 08:52:40 -08:00
Phil Estes
dd3746973e
Merge pull request #11122 from tianon/simple-dockerfile
...
Add secondary "simple" Dockerfile
2015-03-06 11:52:07 -05:00
Jessie Frazelle
aa1dce8eda
Merge pull request #11175 from coolljt0725/fix_build_bash_completion
...
Fix docker build -f bash completion and docker run bash completion
2015-03-06 15:53:48 +00:00
Lei Jitang
00d3727106
Fix docker build and docker run bash completion
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-03-06 15:35:52 +08:00
Ahmet Alp Balkan
957bc8ac50
remote api: explain Kind (ChangeType)
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-03-05 19:39:14 -08:00