38505617da
Fixes #8690
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 373fd1ce16f5699afc55d595ec6a4e684b7483bc
Component: engine
2014-10-21 16:47:43 -07:00
b2ef4f0cf2
Merge pull request #8684 from erikh/onbuild_case_insensitive
...
builder: handle cases where onbuild is not uppercase.
Upstream-commit: a07ee0db627f592661fa905e35cb58e1593c1be8
Component: engine
2014-10-21 15:24:15 -07:00
4efe32a77f
builder: handle cases where onbuild is not uppercase.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: a34831f0168156ded7ecf96a1734c2735fede1ca
Component: engine
2014-10-21 20:17:37 +00:00
d1d44d2d21
Merge pull request #8423 from unclejack/lint_changes
...
lint changes part 1
Upstream-commit: 9df3e45ba985a6ed7e9a07b308d56d694d1c13ad
Component: engine
2014-10-21 12:15:58 -04:00
f69339516b
Merge pull request #8665 from cpuguy83/8659_clean_paths_for_volumes
...
Clean volume paths
Upstream-commit: cf44d6f9cc8f1a84ea6e3c35a9f2d9b232d08d9b
Component: engine
2014-10-21 11:17:03 -04:00
49dfc3aa46
Merge pull request #8573 from estesp/integration-test-migrate
...
Migrate container GET API tests from integration to integration-cli
Upstream-commit: a10876d35520df10b9a10feb941ffe6922844782
Component: engine
2014-10-20 18:06:40 -07:00
94a9c0132e
Merge pull request #8509 from cpuguy83/make_copy_support_volumes
...
Make container.Copy support volumes
Upstream-commit: a0781f3ea91b47f1a086d441e40296d40a5c84d9
Component: engine
2014-10-20 17:34:30 -07:00
94f641a2fe
Make container.Copy support volumes
...
Fixes #1992
Right now when you `docker cp` a path which is in a volume, the cp
itself works, however you end up getting files that are in the
container's fs rather than the files in the volume (which is not in the
container's fs).
This makes it so when you `docker cp` a path that is in a volume it
follows the volume to the real path on the host.
archive.go has been modified so that when you do `docker cp mydata:/foo
.`, and /foo is the volume, the outputed folder is called "foo" instead
of the volume ID (because we are telling it to tar up
`/var/lib/docker/vfs/dir/<some id>` and not "foo", but the user would be
expecting "foo", not the ID
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: ef98fe0763024abd90bd5a573fec816895ee92e4
Component: engine
2014-10-20 20:23:01 -04:00
13b9038a18
Clean volume paths
...
Fixes #8659
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 964f9965c75b89f95060c62ba512ed6ceb525992
Component: engine
2014-10-20 19:07:56 -04:00
fdb40707dc
Merge pull request #8638 from LK4D4/fix_8632
...
Don't write pull output to stdout on container creating
Upstream-commit: af52f8edcf7a4a1b9eaf39d11165e5d3d9457df4
Component: engine
2014-10-20 18:10:47 -04:00
6e31e9c7ee
Merge pull request #8543 from brahmaroutu/filter_containers_7599
...
Adding capability to filter by name, id or status to list containers api
Upstream-commit: 52784c09b726846a5d404720989a36e0664155cb
Component: engine
2014-10-20 15:04:24 -07:00
41862f8f56
Merge pull request #8511 from coolljt0725/fix_tag
...
Fix tag an existed tag name of a repository
Upstream-commit: b90ab68f2a10e3f1e7a3568e7338afc89cbd00bc
Component: engine
2014-10-20 14:32:23 -07:00
75af0c43de
Merge pull request #8559 from rhatdan/404
...
On Red Hat Registry Servers we return 404 on certification errors.
Upstream-commit: 0c7d2ff2d4a039e7531ba0e09b8dce1670208541
Component: engine
2014-10-20 14:13:34 -07:00
da88350fb7
Merge pull request #8657 from vincentbernat/update/zsh-completion-2
...
zsh: update zsh completion for docker command
Upstream-commit: 551047a64efdb84a3ac9e5697e765b1da77bcaba
Component: engine
2014-10-20 14:48:00 -06:00
d5e9b821af
Adding capability to filter by name, id or status to list containers api
...
Closes #7599
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 16346253537267b42bbf35e81c0139b4d0aee43c
Component: engine
2014-10-20 18:33:20 +00:00
87dffd42be
On Red Hat Registry Servers we return 404 on certification errors.
...
We do this to prevent leakage of information, we don't want people
to be able to probe for existing content.
According to RFC 2616, "This status code (404) is commonly used when the server does not
wish to reveal exactly why the request has been refused, or when no other response i
is applicable."
https://www.ietf.org/rfc/rfc2616.txt
10.4.4 403 Forbidden
The server understood the request, but is refusing to fulfill it.
Authorization will not help and the request SHOULD NOT be repeated.
If the request method was not HEAD and the server wishes to make
public why the request has not been fulfilled, it SHOULD describe the
reason for the refusal in the entity. If the server does not wish to
make this information available to the client, the status code 404
(Not Found) can be used instead.
10.4.5 404 Not Found
The server has not found anything matching the Request-URI. No
indication is given of whether the condition is temporary or
permanent. The 410 (Gone) status code SHOULD be used if the server
knows, through some internally configurable mechanism, that an old
resource is permanently unavailable and has no forwarding address.
This status code is commonly used when the server does not wish to
reveal exactly why the request has been refused, or when no other
response is applicable.
When docker is running through its certificates, it should continue
trying with a new certificate even if it gets back a 404 error code.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 69fe3e1a3493e53acb2da7220764bd3807415ea2
Component: engine
2014-10-20 13:20:48 -04:00
08b7ea45da
zsh: update zsh completion for docker command
...
zsh completion is updated with the content of
felixr/docker-zsh-completion.
The major change since the last merge is the addition of
exec/create (but they were already present in the docker repository) as
well as pause/unpause/logout/events and the use of short/long options
when they are available. Some missing options were also added.
12f00abd7178 Add completion for `exec'
4e2faa075f9a Merge `run' and `create' commands.
34134de077de Add missing long/short options for most commands.
d09f62339ab5 Add completion for `pause' and `unpause'
e4754c3b3b9d Add completion for `logout'
e0935eb3d5d2 Add completion for `events'
dae353cb9afb Add completion for `create`
Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im > (github: vincentbernat)
Upstream-commit: ed7934fd63ed52ad0086aaac62203e58e304bcb7
Component: engine
2014-10-20 15:33:17 +02:00
3605bc7e7e
Merge pull request #8622 from Coaxial/patch-1
...
Update dockerimages.md
Upstream-commit: 528c15afeda9ef4d4b354d7aaf1be109b14d4110
Component: engine
2014-10-20 01:16:20 -04:00
1caca606b4
Merge pull request #8649 from mavenugo/master
...
Fixed a minor docs issue in a Dockerfile Example
Upstream-commit: 5160fbb447586bedd20a58be9be26752419bc3f1
Component: engine
2014-10-20 01:14:54 -04:00
621ba20f0e
Add docker tag tests.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c496f24157afd81c9a26f5746175236485e97fa7
Component: engine
2014-10-20 11:10:31 +08:00
38ac7b23be
Fixed a minor docs issue in a Dockerfile Example
...
The Dockerfile Instruction to create the .vnc directory results in a failure :
-storepasswd failed for file: /root/.vnc/passwd
Signed-off-by: Madhu Venugopal <madhu@socketplane.io >
Upstream-commit: 18141652ba4654458e0cd78dbabe6fc6cc1729ee
Component: engine
2014-10-19 10:16:30 -07:00
92a4d745a5
Merge pull request #8483 from duglin/TabTest
...
Add a testcase to make sure we don't squash tabs or convert them to spaces
Upstream-commit: 005029cbddfba813e8565ff7da4fd356b242a0c8
Component: engine
2014-10-17 16:03:22 -07:00
86ec0544b5
Add a testcase to make sure we don't squash tabs or convert them to spaces
...
This is in response to @SvenDowideit asking if we had a "tab" testcase
in https://github.com/docker/docker/issues/2315#issuecomment-58133508
I couldn't find one so I'm adding one
Closes #2315
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: c980fe09b77700fcaf47459e91a149876b7abef9
Component: engine
2014-10-17 15:52:48 -07:00
98837c45ee
Merge pull request #8639 from erikh/fix_escapes
...
builder: fix escaping for ENV variables.
Upstream-commit: 75fd1b614dfd5acd36975357b51341585f89003c
Component: engine
2014-10-17 15:50:37 -07:00
6ef784efe2
builder: fix escaping for ENV variables.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: df0e0c76831bed08cf5e08ac9a1abebf6739da23
Component: engine
2014-10-17 21:47:35 +00:00
2e9533ccba
Merge pull request #8415 from LK4D4/use_logs_in_builder
...
Use logs instead of attach for builder
Upstream-commit: 3c325f89e544415bafc23006ead0bdc21cab2f61
Component: engine
2014-10-17 13:32:13 -07:00
9bac41ed10
Make daemon.Attach private
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 2db1caee4f23e81107b2647c06b4c677f6ecd7a1
Component: engine
2014-10-17 13:20:02 -07:00
1ccc013586
Use logs instead of attach for builder
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 6f09d064bd438ab4425d6105f40887f02bb9e97e
Component: engine
2014-10-17 13:20:02 -07:00
5e851498dc
Merge pull request #8565 from LK4D4/remove_fixtures_copy_tests
...
Remove fixtures copy tests
Upstream-commit: b357f76e5dfea46079ef8a06d0e23e08f14fd12f
Component: engine
2014-10-17 13:10:30 -07:00
03c4c5fa73
Merge pull request #8561 from albers/bash-completion
...
Fix support for --env-file in bash completion
Upstream-commit: fb5e6526d8b32801ee339dd2b328f6685cd66c0e
Component: engine
2014-10-17 13:26:24 -06:00
1cb2cc041f
Just remove integration-cli/build_tests/TestCopy/MultipleFilesToFile because it wasn't used
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 93d3c8e71d0ca8f33d905c455c0520c423fd7eb9
Component: engine
2014-10-17 11:58:12 -07:00
810883724d
Rewrite TestBuildCopyDisallowRemote to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 98e7608b4cec04463781ccb314259873bbb56a16
Component: engine
2014-10-17 11:58:12 -07:00
50718a9b0f
Rewrite TestBuildCopyEtcToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: c8a5d56fd789b50b78ad58c07a535aaf01af77f7
Component: engine
2014-10-17 11:57:48 -07:00
7e037f1bad
Rewrite TestBuildCopyWholeDirToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 6582ea574cfcd6cc8e3b1abebe7bfcc7aee05ece
Component: engine
2014-10-17 11:57:30 -07:00
5ab35b8993
Rewrite TestBuildCopyDirContentToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 4a029259ff41c37eb72a6f221f9725f66491139f
Component: engine
2014-10-17 11:57:07 -07:00
3100829c7e
Rewrite TestBuildCopyDirContentToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 832618afc6e6a8c489afb40f94340f158f9680c7
Component: engine
2014-10-17 11:56:49 -07:00
ff7999247d
Rewrite TestBuildCopySingleFileToNonExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 24d83afd5203f93a22a3d95a212e9ec295aadc8b
Component: engine
2014-10-17 11:56:28 -07:00
f2d974c957
Rewrite TestBuildCopySingleFileToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 2248109ff8607264ba40d4a4ac24bad66462d105
Component: engine
2014-10-17 11:56:01 -07:00
e5897b7fab
Rewrite TestBuildCopySingleFileToWorkdir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: d41cba6aed1ffdda9c3e3441d720dab9afc3eb66
Component: engine
2014-10-17 11:55:34 -07:00
be8f5dfa14
Rewrite TestBuildCopySingleFileToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 83c5dced10c4e2a40990e927ccc15a1e0428529c
Component: engine
2014-10-17 11:55:04 -07:00
fa31328c73
Rewrite TestBuildCopyAddMultipleFiles to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: e45c92153d0c21308fe5983aa76182cc03ef398e
Component: engine
2014-10-17 11:54:29 -07:00
beee7faafb
Merge pull request #8614 from ryanrdetzel/master
...
exec docs syntax fix
Upstream-commit: 04932e38afa78441e60ba6b86021a61a70e4692c
Component: engine
2014-10-17 14:38:43 -04:00
02f8c7b8a5
Merge pull request #8567 from LK4D4/add_log_done
...
Add logDone for TestBuildAddSingleFileToNonExistDir
Upstream-commit: 5a20dc67b005717a0549fe504a3b0ccf62c913c6
Component: engine
2014-10-17 11:20:12 -07:00
2cbac498ba
Merge pull request #8486 from duglin/Issue5701
...
Add failing testcase for single quotes in CMD
Upstream-commit: 09ceae5c9c268f2b79954b1580c5ec1632f24d0e
Component: engine
2014-10-17 11:11:49 -07:00
c9c863328e
Don't write pull output to stdout on container creating
...
Fixes #8632
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: ad136e1ae3175bd30c87ccbde8e31f0e422ff5ec
Component: engine
2014-10-17 11:08:53 -07:00
8fc55e7794
Merge pull request #8569 from jfrazelle/Cleanup-errorOut-resp
...
Cleanup: integration-cli (get rid of errorOut)
Upstream-commit: 6ac9768eaf0d7f4ebe9dcf8205903f5a4cf1a518
Component: engine
2014-10-17 13:36:00 -04:00
76d0eac075
Merge pull request #8635 from blakery/master
...
Cleanup: Removed unused function layerArchive
Upstream-commit: 83761be409ff830ebcbd122428ff9209a7a17ae9
Component: engine
2014-10-17 10:28:22 -07:00
7e2ab860f7
Merge pull request #8621 from zhgwenming/lxc
...
Fix lxc driver build issue on Mac OS X
Upstream-commit: 9b795108c7c15c531c1ef06889b0e975a822059d
Component: engine
2014-10-17 09:17:25 -07:00
421742174b
Merge pull request #8588 from dqminh/remove-sslv3
...
remove sslv3 from server's TLS supported versions
Upstream-commit: 10f78974ca515e3b7224b8cedd1fb3faa94af641
Component: engine
2014-10-17 12:05:48 -04:00
23d0088241
Removed unused function layerArchive
...
Signed-off-by: Blake Geno <blakegeno@gmail.com >
Upstream-commit: 7cff8db4a381f68d503fe828fb0fb35cf979741c
Component: engine
2014-10-17 10:49:21 -04:00
