Commit Graph

12552 Commits

Author SHA1 Message Date
6148a6ae03 Modify ip_forward instructions
Signed-off-by: ChristoperBiscardi <chris@docker.com>
Upstream-commit: 4ab18fa2ac119c26516f2156dabda9dd0a781301
Component: engine
2015-03-10 19:28:55 -07:00
6d6d8eee07 Fix a few code rendering errors in docs
Signed-off-by: ChristoperBiscardi <chris@docker.com>
Upstream-commit: 79a0fa29f1de0be0d69adf54a63eed7312d4be70
Component: engine
2015-03-08 16:18:43 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
15e04c816c pkg/archive_windows: make use of os.PathSeparator
cc: @jhowardmsft

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 8ba64b383dee8827c70f9c0a0d71aa61d0f0c595
Component: engine
2015-03-05 17:15:11 -08:00
6bfc416abd docker info display http/https_proxy setting
Signed-off-by: Zhang Wentao <zhangwentao234@huawei.com>
Upstream-commit: 06a40f0f281b4679855a406bc202e122d2875949
Component: engine
2015-03-06 09:02:21 +08:00
b626dcd093 integ-cli: skip case-sensitive dockerfile tests on windows
The tests end up overwriting the `dockerfile` with `Dockerfile` since
windows filesystems are case-insensitive. The following methods are
skipped:

- TestBuildRenamedDockerfile
- TestBuildFromMixedcaseDockerfile

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: d046f56e8826f597ddd1752b9289d93b9054fa9d
Component: engine
2015-03-05 15:50:15 -08:00
04c84acfda Merge pull request #11064 from delftswa2014/10970-treesize
Move directory size calculation to pkg/ (fixes #10970)
Upstream-commit: 92e632c84e7b1abc1a2c5cb3a22e0725951a82af
Component: engine
2015-03-05 13:06:02 -08:00
5d75a4f950 Merge pull request #11138 from tianon/go-autogen
Rename .dockerversion to .go-autogen so it's clear that all autogenerated code goes here
Upstream-commit: c40993777f152426ea029c51601152307b15a7a5
Component: engine
2015-03-05 13:00:32 -08:00
603c2fe33f Merge pull request #11179 from rhatdan/selinux-fixes
Two SELinux Changes.
Upstream-commit: 78989424bcbc07d3fb54dfb2a675e0952312028a
Component: engine
2015-03-05 12:19:10 -08:00
cbcbd07469 Merge pull request #11156 from jfrazelle/ulimit-skip-lxc
Skip new ulimits test on lxc
Upstream-commit: 27acf7b4acf8efbda8ee6dc6b920db18292d11cd
Component: engine
2015-03-05 12:18:52 -08:00
9984f3e27c Merge pull request #11172 from duglin/5169-LinkEnvDocs
Add some text about env vars when linking containers
Upstream-commit: 0bf6015745baf0dcb7d671df3b4852a027394b2c
Component: engine
2015-03-05 12:18:04 -08:00
ae82ea5f07 Two SELinux Changes.
daemon/volumes.go

  This SetFileCon call made no sense, it was changing the labels of any
directory mounted into the containers SELinux label.  If it came from me,
then I apologize since it is a huge bug.

The Volumes Mount code should optionally do this, but it should not always
happen, and should never happen on a --privileged container.

The change to

daemon/graphdriver/vfs/driver.go, is a simplification since this it not
a relabel, it is only a setting of the shared label for docker volumes.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 4eb2fd169f8c9adbee4a9a0bd387f96b4e725963
Component: engine
2015-03-05 13:55:44 -05:00
7f2c00ba17 Merge pull request #11151 from chenhanxiao/See-also-export-import-save-load
docs: add See Also for description of export/import and save/load
Upstream-commit: e4a90897e129627529a0ce946b8b3f98ec7e72b6
Component: engine
2015-03-05 10:35:37 -08:00
1f1e8e9abc Add some text about env vars when linking containers
In particular, the security implications.

Closes #5169

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3c9425d40dbb069db9fe795eddc3fccfc62164f8
Component: engine
2015-03-05 09:39:10 -08:00
407e2c2bdd Merge pull request #11173 from estesp/cleanup-etc-cover-test
Clarify/cleanup "/etc" volume overlays special /etc mounts test
Upstream-commit: 620339f166984540f15aadef2348646eee9a5b42
Component: engine
2015-03-05 10:47:36 -05:00
ac978258f3 Merge pull request #11163 from duglin/RmiTest
Better error message for `docker rmi ''`
Upstream-commit: 214eae6f53fb143be9dacd1881e2ec1c56a6bb26
Component: engine
2015-03-05 09:49:46 -05:00
9e58235829 Clarify/cleanup "/etc" volume overlays special /etc mounts test
Added link to original issue and clarified text so someone without any
background on the original issue can understand why the test exists.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: b5036ad5c64f19a52806df500b6a89d9c3294ac6
Component: engine
2015-03-05 09:41:56 -05:00
aa9b58cd0b Don't test resolv.conf updater on overlay filesystem
The overlay filesystem does not support inotify at this time. The
resolv.conf updater test was passing on overlay-based Jenkins because of
a fluke--because it was DIND, /etc/resolv.conf on the "host" was really
a bind-mounted resolv.conf from the outer container, which means a watch
directly on that file worked as it was not overlay backed.  The new test
(from #10703) unmounts the bind-mounted copy to test create and modify
code-paths, which caused us to hit the issue.

This PR also adds a note to the docs about the lack of auto-update when
using the overlay storage driver.

See https://lkml.org/lkml/2012/2/28/223 for more info on inotify and
overlay.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 9057ca2541582fc41eb7cb45edd332247a813bba
Component: engine
2015-03-05 00:22:01 -05:00
bac4428faa dispatchers: warn user if try to use EXPOSE ip:hostPort:containerPort
We could use EXPOSE ip:hostPort:containerPort,
but actually it did as EXPOSE ::containerPort

commit 2275c833 already warned user on daemon side.
This patch will print warning message on client side.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 26e85b0db1b896e98071f121fb14b2c6d905ed4f
Component: engine
2015-03-04 21:09:50 -05:00
caf81c4e3f docs: add See Also for description of export/import and save/load
make them reference to each other.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: cbb149f52f5624cec41498398ab48c4043678707
Component: engine
2015-03-04 20:21:38 -05:00
62e7b16446 Docs: add restart-policies to 'Run reference'
This moves some information on restart-policies from
the "command line" page to "run reference".

Also fixes some minor typos and adds a "NOTE"
about --rm and --restart not allowed to be combined.

Also removes inline CSS styles from tables,
which will be styled by the stylesheet, and fixes
some minor MarkDown errors (`<` -> &lt;)

depends on https://github.com/docker/docs-base/pull/1

resolves #11069

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8833779ae0384f3f9a995f94e42478451107a5ed
Component: engine
2015-03-05 01:13:53 +01:00
71919ac23a pkg/archive: adjust chmod bits on windows
This change modifies the chmod bits of build context archives built on
windows to preserve the execute bit and remove the r/w bits from
grp/others.

Also adjusted integ-cli tests to verify permissions based on the platform
the tests are running.

Fixes #11047.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 1a22418f9f1573ca8521831d52c8e0562cb3ef8f
Component: engine
2015-03-04 14:10:37 -08:00
8d2cefd5a5 Seems like an un-necessary if statement
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 4e5ea0c8755231dfffd7b82bc6551415b14ed0de
Component: engine
2015-03-04 13:24:17 -08:00
f888d145c2 Better error message for "docker rmi ''"
See: https://github.com/docker/docker/issues/10867

While looking at #10867 I noticed that the error message generated for
a blank image ID wasn't very helpful so this fixes that.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: eeb36c9348b7af339638936a98d66ee4f9be62ee
Component: engine
2015-03-04 13:21:59 -08:00