458ef2c326
Merge pull request #8876 from whoshuu/docpatch-2
...
Remove out-of-context code block
Upstream-commit: a61c4dc959bd9370f6c6240efbeff2bf73433676
Component: engine
2014-11-05 10:52:50 +01:00
9683bcb389
Merge pull request #8577 from vbatts/vbatts-registry_certs
...
registry: don't iterate through certs
Upstream-commit: 662efd95c7a30e5593ca9fdc672ad3f1d6f9703c
Component: engine
2014-11-05 09:46:24 +02:00
e4bc9907a8
Merge pull request #8915 from gDD/patch-1
...
Remove extra line feed typo
Upstream-commit: 387c892126534a12d8dccffaed8c8a8f5f2548b8
Component: engine
2014-11-05 08:22:09 +01:00
f4fd766b12
Merge pull request #8908 from medimatrix/patch-1
...
Grammatical mistake in docs
Upstream-commit: 49ecc499d7f0898fc046cd19468a187b7d5e4d5c
Component: engine
2014-11-05 08:21:00 +01:00
169fd0e84d
Merge pull request #8900 from nhsiehgit/updatefooter
...
Updatefooter
Upstream-commit: 0d513b5a845f274c4ff06f6e7bc772e49167cda3
Component: engine
2014-11-04 17:14:58 -08:00
ab8d055502
Merge pull request #8345 from duglin/Issue5184
...
Add a better error message when we get an unknown http issue
Upstream-commit: b79211f4ae0f08975d02c5d51bb482f965d60a88
Component: engine
2014-11-04 20:07:41 -05:00
1a2c21becb
Add a better error message when we get an unknown http issue
...
Closes #5184
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6fdaa66652d65558d8225d58f3ac48904ebac1de
Component: engine
2014-11-04 16:46:41 -08:00
acc213bbca
Merge pull request #8892 from fredlf/relnotes-edit
...
Edits and refinements to 1.3.1 release notes.
Upstream-commit: 098ccba6bd9d64f11690c4ef9cc61e371557316d
Component: engine
2014-11-04 16:43:07 -08:00
1b36243f30
Updated footer to match rest of site
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: ebeccee968e5edba5043920581a5b6976aa504c0
Component: engine
2014-11-04 15:28:38 -08:00
3b3d561fb2
Merge pull request #8404 from danjpgriffin/master
...
Preserve extended attributes and acls on archlinux build
Upstream-commit: c478143ec0ca8f610f7980991b9b2ba0e1160b3e
Component: engine
2014-11-04 14:14:10 -07:00
8b766a1400
registry: don't iterate through certs
...
the golang tls.Conn does a fine job of that.
http://golang.org/src/pkg/crypto/tls/handshake_client.go?#L334
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: a368e064a972ab75561ee50067a3168b9d8d277e
Component: engine
2014-11-04 16:12:23 -05:00
e0fdd888ad
Merge pull request #8936 from jfrazelle/drone-server
...
Switch Travis for Drone
Upstream-commit: 14e65b4f81004b0946816f93a46576bd991fe6e2
Component: engine
2014-11-04 11:18:39 -07:00
94faaa2f15
Merge pull request #8700 from unclejack/install_no_pull
...
contrib/install.sh: remove pull of hello-world
Upstream-commit: c6cf978b4ba8f246094001be8f8d8d6a4319f697
Component: engine
2014-11-04 10:28:43 -07:00
1b800d5ab8
Merge pull request #8950 from Bertg/patch-1
...
makes the -s --size option documentation clearer
Upstream-commit: 59d4161f6945cf50889c2e7418f8c8334b9b53ea
Component: engine
2014-11-04 09:09:15 -08:00
53dcf06a52
contrib/install.sh: remove pull of hello-world
...
This removes the pull of the hello-world image from install.sh to
address privacy concerns.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: f9d80712d9417feadd63cb71c0c7825c4e9f9fd4
Component: engine
2014-11-04 19:05:47 +02:00
866705ded6
Merge pull request #8946 from unclejack/stream_decode
...
Decode JSON to avoid ReadFile
Upstream-commit: b8678aa7f5f2b266644825a460a0126fe6439b76
Component: engine
2014-11-04 09:02:40 -08:00
de998bcb26
makes the -s --size option documentation clearer
...
Upstream-commit: 762ffda95d9ddd4f75fa94971ac85c52389648c1
Component: engine
2014-11-04 17:49:39 +01:00
0e78b6c4a5
Merge pull request #8871 from tonistiigi/start-wait-hijack
...
Wait for hijack on docker start command
Upstream-commit: a34f31b488dce94314e3218e3d52c38747cabc2f
Component: engine
2014-11-04 08:46:56 -08:00
87ba3d709c
Merge pull request #8877 from erikh/proxy_error_check
...
proxy: Fix a potential panic handling error states.
Upstream-commit: fa59fe997c83e2a6968f8c03c64352acd71c26da
Component: engine
2014-11-04 11:40:02 -05:00
8e8fff205d
Merge pull request #8813 from jlhawn/aufs_exclude_on_tar_layer
...
Exclude `.wh..wh.*` AUFS metadata on layer export
Upstream-commit: 6718791ea28be1bd6bce49cd9f49844c24f9dcf7
Component: engine
2014-11-04 11:38:12 -05:00
beb511a224
Merge pull request #8906 from dqminh/remove-copy-directory
...
change util.CopyDirectory to archive.CopyWithTar
Upstream-commit: edae8830a9030e23e68cb2fe1edc6f58f825c1b4
Component: engine
2014-11-04 08:02:35 -08:00
1ce2377d8b
Merge pull request #8390 from MalteJ/set-macaddress
...
Adding docker-cli run param to set MAC address
Upstream-commit: 9eb8fcd58a5dc0a6fd812fc2bdc410f36dd63cc0
Component: engine
2014-11-04 07:54:59 -08:00
d1a9c32b50
enhancing set-macaddress docu #2
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: 28605bc4d55bcfc7a5562e4de3e01b1d5cd9bdcd
Component: engine
2014-11-04 15:19:47 +01:00
ec75c9da78
volume: stream JSON & Decode
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: f665be55fe832086202e54449402c1513cf4f195
Component: engine
2014-11-04 16:15:07 +02:00
617b00b175
image: stream img JSON & Decode in LoadImage
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 4dbbe4f51a22a9ec335fbf2f6e3981132f868312
Component: engine
2014-11-04 16:15:00 +02:00
af218ee675
daemon/container: stream & decode JSON
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 4bc28f4e6bb38ec70fb98a4deea723a2d0812d98
Component: engine
2014-11-04 16:14:47 +02:00
8be6c529c8
Merge pull request #8924 from pdericson/api-doc-fix
...
Fix typo in api docs: stdou -> stdout
Upstream-commit: b68d7d39bcd96744eec883bb305e907c10fe6aa6
Component: engine
2014-11-03 23:09:16 -08:00
a59bba1a32
Merge pull request #8799 from jlhawn/remove_jsondata_arg
...
Remove `jsonData` argument from `image.StoreImage`
Upstream-commit: 5b03a21963931f917297e52cb17a62680f1c2a6e
Component: engine
2014-11-03 20:55:40 -05:00
c408fa1be8
Switch travis status to drone.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 4b4b88a8730b459944b0b0ab51adc7d401c87667
Component: engine
2014-11-03 17:48:50 -08:00
2066d9b496
Remove travis CI.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 471adb73a9c3a23ac7c599621531b5fada1a127f
Component: engine
2014-11-03 17:46:33 -08:00
ade837e2a4
Remove jsonData argument from image.StoreImage
...
The argument specified the json data to save to disk when registering
a new image into the image graph. If it is nil, then the given image
is serialized to json and that is written by default. This default
behavior is sufficient if the given image was originally deserialzed
from this jsonData to begin with which has always been the case.
Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 26184de8ab1dfe812094c55c9becd8ebb60ed7be
Component: engine
2014-11-03 17:39:21 -08:00
57dd70ac4a
Merge pull request #8863 from vbatts/vbatts-archive_stat
...
./pkg/archive: clean up Stat_t assertion
Upstream-commit: 54d6d12556d7f83ad3e9a3ee081ddb6cc98549b4
Component: engine
2014-11-03 19:14:39 -05:00
9bfa240ca3
Merge pull request #8590 from jfrazelle/8307-iptables-d-restart-fix
...
On daemon shutdown iptables cleanup successfully
Upstream-commit: b8ab729ae63e3b21105ee00478995d8d81dc7d3d
Component: engine
2014-11-03 18:29:51 -05:00
78e3305d6c
Added missing item from Changelog
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 06f366bf0041a223ae848e6a8df0c8cc41f08001
Component: engine
2014-11-03 13:51:51 -08:00
6cb70de86c
Edits and refinements to 1.3.1 release notes.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 1a1b0f223d5b877271d1484d6235c4a7b9e4cb32
Component: engine
2014-11-03 13:50:42 -08:00
34bb5c5a04
Merge pull request #8901 from dmcgowan/v2_registry_mirror_check
...
Skip V2 registry and immediately fallback to V1 when mirrors are provided
Upstream-commit: a7dea37b780997c77f034e8cf95f1d6956f18b3f
Component: engine
2014-11-03 13:37:55 -08:00
d3c1cd34ce
Merge pull request #8739 from duglin/CleanupDockerIgnores
...
Do some cleanup on .dockerignore paths
Upstream-commit: a85f58719f29f76f465747d095c85dbb8ba69d06
Component: engine
2014-11-03 16:05:24 -05:00
935e9a4b52
Merge pull request #8932 from duglin/UpdateLogrus
...
Update logrus to the latest so we can use ParseLevel() for PR #8335
Upstream-commit: 38d3888194c4639200da474d4e186dcbedb6f02d
Component: engine
2014-11-03 16:00:22 -05:00
fe1e9f085e
Merge pull request #8907 from icecrime/clarify_user_instruction_doc
...
Clarify USER instruction documentation
Upstream-commit: 8872c2903a36b3fbdb76046a4d15cf994d7e336a
Component: engine
2014-11-03 11:58:56 -08:00
d09ed90b9d
Update logrus to v0.6.0 so we can use ParseLevel() for PR #8335
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: a12d89739412dc9fa9f961e0e4a310ec5a53bd74
Component: engine
2014-11-03 11:57:30 -08:00
aa23d4d1a4
Merge pull request #8927 from bfirsh/dont-pass-args-to-help-when-command-doesnt-exist
...
Fix help text being incorrect with multiple args
Upstream-commit: 025363848b53bf6e2f3726e39fd7ee296d55d2b0
Component: engine
2014-11-03 11:23:57 -08:00
d79f92fe19
Merge pull request #8929 from LK4D4/fix_filter_hang
...
Fix deadlock in ps exited filter
Upstream-commit: 9ef9bfd15119a3b7c84177ed20ead24d6fb2c2a9
Component: engine
2014-11-03 11:07:24 -08:00
b9029ea913
Fix deadlock in ps exited filter
...
Fixes #8909
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 03ea2166b66632ee7cdd824d7acd87b15c9bccb2
Component: engine
2014-11-03 10:51:03 -08:00
0798cdafc5
Update "official repos" doc to mention 100 char short desc limit
...
The Hub no longer accepts short descriptions over 100 characters.
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Upstream-commit: 693b9d335cc1fe688a7fffb62e5da97a5d5a3b13
Component: engine
2014-11-03 10:12:05 -07:00
118bb8077c
Fix help text being incorrect with multiple args
...
E.g. "docker foobar run" would have printed "Command not found:
foobar" and printed the help text for "run". It should instead
print the root help message for docker.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: ef004ec03fe5aad33da7d53f196f16382c750d07
Component: engine
2014-11-03 16:46:01 +00:00
299f6b0aa6
Fix typo in api docs: stdou -> stdout
...
Upstream-commit: 4437573c96cdc52e98f44356be5c96dff4ce5907
Component: engine
2014-11-03 10:52:50 +00:00
590a54ca61
enhancing set-macaddress docu
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: 971fc2253af77ae4a22a3741fff51d84cd9bc697
Component: engine
2014-11-03 11:43:27 +01:00
f115554d46
Do some cleanup on .dockerignore paths
...
While working on the fix for #8330 I noticed a few things:
1 - the split() call for the .dockerignore process will generate a blank
"exclude". While this isn't causing an issue right now, I got worried
that in the future some code later on might interpret "" as something bad,
like "everything" or ".". So I added a check for an empty "exclude"
and skipped it
2 - if someone puts "foo" in their .dockerignore then we'll skip "foo".
However, if they put "./foo" then we won't due to the painfully
simplistic logic of go's filepath.Match algorithm. To help things
a little (and to treat ./Dockerfile just like Dockerfile) I added
code to filepath.Clean() each entry in .dockerignore. It should
result in the same semantic path but ensure that no matter how the
user expresses the path, we'll match it.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: c0f0f5c9887032c606750b645001829d9f14f47c
Component: engine
2014-11-02 11:29:46 -08:00
535fe272a4
Remove extra line feed typo
...
The removed extra line feed broke the paragraph at https://docs.docker.com/userguide/dockerizing/
Upstream-commit: 795533ede700395add26746b50f3d34aa3c1a3eb
Component: engine
2014-11-02 22:55:36 +08:00
d9af4bf2cb
Grammatical mistake in docs
...
Change `The team can now use this image by run their own containers.` to `The team can now use this image by running their own containers.`
Upstream-commit: d22d32d61fc024d2c81e75f870d802f7a2cd28fd
Component: engine
2014-11-01 21:22:43 +00:00
