Commit Graph
13616 Commits
Author SHA1 Message Date
Ahmet Alp Balkan f486128375 Add system time to /info
This change adds daemon's system time as RFC3339Nano to the `/info` endpoint
and shows in a more readable format (UnixDate) in `docker -D info` output.

I will be using this to fix the clock skew between the remote test host and
the CI machines running `docker events`-related tests as they're using `--since`
and `--until` and the timestamps are not matching when daemon is not on the
same machine.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 2977fd2b7aed42008ca2ad90dcd8fec5ead4e86b
Component: engine
2015-03-10 15:29:05 -07:00
Phil Estes 36b60a9555 Merge pull request #11282 from duglin/FixAPITestCode
Fixup a test for -f processing
Upstream-commit: 1b1cc100f2859c937ddad9adfe6059bb48e514a1
Component: engine
2015-03-10 12:10:08 -04:00
Tibor Vass d2615972c0 Merge pull request #11143 from dmcgowan/graph-v2-push-cleanup
Cleanup v2 push logic
Upstream-commit: eb21eb95e592951d0f80ced9273fd025959bb350
Component: engine
2015-03-10 11:56:02 -04:00
Tibor Vass e0f80352b9 Merge pull request #11218 from tianon/refactor-frozen
Refactor busybox downloading as generic "frozen-images"
Upstream-commit: cda003775f0be8caa6acc4a4921f93a2024e8eda
Component: engine
2015-03-10 11:47:00 -04:00
Jessie Frazelle 02ceac919e Merge pull request #11208 from LK4D4/new_libcontainer_api
New libcontainer api
Upstream-commit: 2fb89b2e2ca1043abf8d4c02532ce42135efe6f6
Component: engine
2015-03-10 07:50:19 -07:00
Doug Davis 4a7bad6471 Fixup a test for -f processing
Thanks to @ahmetalpbalkan for noticing... we had an old check in this
testcase that no longer applied (due to stuff being removing recently).
However, while in there I added a check to make sure that the file referenced
by the query parameter isn't used at all.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a853f8e4687adb78c0e63019caae32b216cce925
Component: engine
2015-03-10 05:47:12 -07:00
Derek McGowan 91448d8573 Cleanup v2 push logic
Manifest is now generated during a v2 push, not relying on previously generated hashes. When pushing a layer, the hash is directly calculated from the tar contents which will be pushed. Computing the hash on push ensures that the hash contents always match what is seen by the registry. This also mitigates issues with tarsum differences and permits using pure SHA digests.
Additionally the new manifest function is moved to the unit tests since it is no longer called outside the tests.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: d172f1253a6a277dce71cd59b0d87119f3ed282e
Component: engine
2015-03-09 18:33:15 -07:00
Tianon Gravi c071c815d3 Refactor busybox downloading as generic "frozen-images"
This makes it much simpler to add new "frozen" images -- simply add them to the `Dockerfile` and in `hack/make/.ensure-frozen-images` and you're off to the races.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 09b4c2585284d1125d4d299a7d58b36c1d0baf17
Component: engine
2015-03-09 19:02:59 -06:00
Michael Crosby 0edc2f2c31 Merge pull request #11268 from duglin/FixServerURLUsage
Use server.URL() instead of server.URL
Upstream-commit: c5af44e6d0a1ae8cdc1a91de28c0b73dd5478fb2
Component: engine
2015-03-09 17:18:32 -07:00
Doug Davis 9863597201 Use server.URL() instead of server.URL
Old way now returns the go type instead of the value

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 40c8e78757a75a9e251223f563fc5adb2bc9bf99
Component: engine
2015-03-09 17:00:45 -07:00
Tibor Vass c53e223228 Merge pull request #11159 from duglin/LastModifiedTest
Add an HTTP Last-Modified header testcase
Upstream-commit: feb02a2bbf9b4b4eb8f68bcec652ac687195f462
Component: engine
2015-03-09 19:22:27 -04:00
Tibor Vass 31e0dffb09 Merge pull request #11258 from HuKeping/cmdlogin
Remove leading spaces of username when login
Upstream-commit: aa19a78d3dacc5e774085933b897a01dd78e71d0
Component: engine
2015-03-09 19:02:24 -04:00
Hu Keping edb661c0bf Remove leading spaces of username when login
When we run `docker login` we will be asked to input our username.

Prior to this PR, "userA" and " userA" will be considered as two
diferrent user, which is not right.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 2687502ba4e3d3eb41b6da6b52de151ef5dca9a2
Component: engine
2015-03-10 07:54:08 +08:00
Alexander Morozov a630d7f64a Merge pull request #10893 from ahmetalpbalkan/win-cli/BuildViaDockerfileURL-same-host-fix
integ-cli: Implement remote FakeStorage server for build via URL tests
Upstream-commit: 7c4951d552d25c0608c44d03529c6b8cbe5d1e06
Component: engine
2015-03-09 13:33:40 -07:00
Tibor Vass 7a9b88348f Merge pull request #10423 from dmcgowan/v2-registry-fix-single-names
Allow single name component repository names
Upstream-commit: 02e0a23d80a4c19c2d475c3f205eba79a45f8a59
Component: engine
2015-03-09 15:40:22 -04:00
Ahmet Alp Balkan 60d13dc8cb integ-cli: Implement remote FakeStorage server for build via URL tests
Implemented a FakeStorage alternative that supports spinning
up a remote container on DOCKER_TEST_HOST to serve files over
an offline-compiled Go static web server image so that tests which
use URLs in Dockerfile can build them over at the daemon side.

`fakeStorage` function now automatically chooses if it should
use a local httptest.Server or a remote container.

This fixes the following tests when running against a remote
daemon:

- `TestBuildCacheADD`
- `TestBuildCopyWildcardNoFind`
- `TestBuildCopyWildcardCache`
- `TestBuildADDRemoteFileWithCache`
- `TestBuildADDRemoteFileWithoutCache`
- `TestBuildADDRemoteFileMTime`
- `TestBuildADDLocalAndRemoteFilesWithCache`
- `TestBuildADDLocalAndRemoteFilesWithoutCache`
- `TestBuildFromURLWithF`
- `TestBuildApiDockerFileRemote`

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 2e95bb5f1a65d90f412568d6df82a9e2cdd3e790
Component: engine
2015-03-09 12:03:55 -07:00
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
Derek McGowan 89701d66ba 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)
Upstream-commit: a0ca9190cc29215ce9ae69a6187d85bf689c8aa7
Component: engine
2015-03-06 18:18:53 -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
Alexander Morozov 3b04936e06 Execdriver implementation on new libcontainer API
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 68ba5f0b69c9f383269fb5bc2c78798b312e98cc
Component: engine
2015-03-06 14:46:58 -08: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