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
3856bb0808
Clarify USER instruction documentation
...
Reuse WORKDIR wording to specify that the USER instructions affect the
following RUN, CMD, and ENTRYPOINT instructions.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: de9bf24750e0a9774a475eae74cbd2c241224e10
Component: engine
2014-11-01 14:04:51 -07:00
eaa70c2db5
change util.CopyDirectory to archive.CopyWithTar
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Upstream-commit: e5ecfd3b178bbc399de344635606d82e147276ff
Component: engine
2014-11-01 12:23:08 -04:00
c0897a4514
Adding docker-cli run param to set MAC address
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: f2df38050e019c0db265e7c3e38ee0de8948ca77
Component: engine
2014-11-01 15:35:09 +01:00
b74bf3c41f
Skip V2 registry and immediately fallback to V1 when mirrors are provided
...
Since V2 registry does not yet implement mirrors, when mirrors are given automatically fallback to V1 without checking V2 first.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 9d6391a9ebca6c7bd4b262ebb5a4baf9d2c222f9
Component: engine
2014-10-31 18:10:48 -07:00
9fda67e5fe
Merge pull request #8884 from thomasleveil/userguide-so26652877
...
Reword a sentence bringing confusion about docker links
Upstream-commit: 4d4a7b81bf82e243bca07af815cb1fe03193b135
Component: engine
2014-10-31 17:09:16 -07:00
3613ec484c
Merge pull request #8167 from brahmaroutu/expose_ports_1834
...
adding support for port ranges on --expose
Upstream-commit: 92bb49720199918b808bcb7544b69f16e3d45c49
Component: engine
2014-10-31 16:20:08 -07:00
b972337ce2
adding support for port ranges on --expose
...
Closes #1834
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: fd774a818c7d8942922b4f74eabd2a4e14094e1a
Component: engine
2014-10-31 23:06:30 +00:00
4047c8a0da
Merge pull request #8468 from laktek/master
...
Fix URL check in build from Git.
Upstream-commit: 9cc71b459771d0cbac51051410859fd878236920
Component: engine
2014-10-31 14:43:21 -07:00
e50667ec3a
Merge pull request #8818 from coolljt0725/fix_exec_help
...
Fix docker exec help messages.
Upstream-commit: 7cb12133ae362055ff51d1ea5f71ad9cef6b2fae
Component: engine
2014-10-31 14:36:01 -07:00
912734006d
Merge pull request #8878 from thaJeztah/patch-1
...
Typo in 1.3.1 change log
Upstream-commit: a92393bb170be8e10cc2dcada748d0e5b1da0569
Component: engine
2014-10-31 14:32:25 -07:00
214986ab4e
Merge pull request #8894 from vieux/fix_docs_filter
...
add missing 'current filter' to ps
Upstream-commit: 058aa0cbc2f1f85cf777138761389f9bb4af6584
Component: engine
2014-10-31 14:26:29 -07:00
21782f3667
Merge pull request #8895 from erikh/proxy_udp_size
...
pkg/proxy: Bump the maximum size of a UDP packet.
Upstream-commit: 7a2dc8b889e6154a6bfc93305382c894f716d61d
Component: engine
2014-10-31 13:11:54 -07:00
fc011be6fb
pkg/proxy: Bump the maximum size of a UDP packet.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 5a73be8e9fbe5defc9fc71c6839bea1d888d6a95
Component: engine
2014-10-31 18:56:07 +00:00
287b15d7a3
add missing 'current filter' to ps
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: f95d73dfd48ad4a3211f2f5e89e8195e2066c939
Component: engine
2014-10-31 18:28:10 +00:00
e8cb0ca4b5
Merge pull request #8839 from irachex/dns-search-doc
...
Add docs for --dns-search=.
Upstream-commit: 0f9f5f3fdfd45ef7759d6b163860aac4436bf9b7
Component: engine
2014-10-31 11:25:57 -07:00
d4dfa6563a
Reword a sentence bringing confusion about docker links
...
As [discovered][1] doing user support, the sentence `You've learned that a link creates a
source container that can provide information about itself to a recipient container` brings
confusion.
[1]: http://stackoverflow.com/questions/26652877/how-to-avoid-redundant-container-linking-in-docker-when-propagating-ip-addresses/26654203?noredirect=1#comment41945048_26654203
Signed-off-by: Thomas LEVEIL <thomasleveil@gmail.com >
Upstream-commit: 906985123aa6b7874c3c0e21f0fb5603928ff6dd
Component: engine
2014-10-31 13:00:59 +00:00
76705656f8
Typo in 1.3.1 change log
...
Replaced envrionment -> environment
Signed-off-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com >
Upstream-commit: 29965246a735acbdbd9cbb4e54f1d2d9efb120f3
Component: engine
2014-10-31 08:31:20 +01:00
7c71344f59
proxy: Fix a potential panic handling error states.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: ad5b307d0fb00ff0a63b3f97e529fa67bfce50b3
Component: engine
2014-10-31 04:20:26 +00:00
7a8d9de28f
Remove out-of-context code block
...
Signed-off-by: Huu Nguyen <whoshuu@gmail.com >
Upstream-commit: 8453cf0671879aef04f96ffce52bf3fbcb75ca13
Component: engine
2014-10-30 23:58:14 -04:00
a8e1069f16
Fix apparent copy paste mistake
...
The note under the RUN header refers to the CMD instruction. It should refer to the RUN instruction instead.
Signed-off-by: Huu Nguyen <whoshuu@gmail.com >
Upstream-commit: b16f3736edf2427761cbc1c8fc5c4892299b2232
Component: engine
2014-10-30 23:22:51 -04:00
c33ebe12c4
Mapping change in code
...
Signed-off-by: Huayi Zhang <irachex@gmail.com >
Upstream-commit: eaa050fdb8fed612b3cd5d204fddaedf27a20370
Component: engine
2014-10-31 09:57:54 +08:00
0dbcc807c8
Merge pull request #8837 from sawalls/patch-2
...
ubuntulinux.md - old commands, typo, section movement
Upstream-commit: 107898a773d7345119917cf8f879a2c71f0a940c
Component: engine
2014-10-30 18:48:24 -07:00
4454d2b409
Fix docker exec command help messages
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: d8b17d785a03246cb3a081223a0242469af7d410
Component: engine
2014-10-31 09:36:07 +08:00
7791553e61
Merge pull request #8873 from SvenDowideit/de-cleanup-Dockerfile
...
Yes, the review really should have picked up this spelling mistake
Upstream-commit: c2ff42552ab1fce8c4385d32b667aee676d70f70
Component: engine
2014-10-30 18:32:28 -07:00
4085dd6a28
ubuntulinux.md - old commands, typo, section movement
...
- Removed some commands related to autocomplete/symlinks that don't seem to be required anymore on Ubuntu 14.04
- Fixed one minor typo ("see LINK _for_ details," not "see LINK details")
- Moved section "Giving non-root access" to top level, rather than being under Ubuntu 13 (the section isn't specific to Ubuntu 13, and even references Ubuntu 14).
Signed-off-by: Scott Walls <sawalls@umich.edu >
Upstream-commit: bc62a35ffb2eeacb3ae79bc65076a01744d78a5d
Component: engine
2014-10-30 18:28:37 -07:00
f79466b12e
Yes, the review really should have picked up this spelling mistake
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: bfe21f095d491dc9ee7e664b260239cbed8f505f
Component: engine
2014-10-31 11:10:17 +10:00
b39bfb477a
Merge pull request #8850 from shuai-z/clean-mount
...
Clear the internal state before raising error.
Upstream-commit: f68b8b33e6827c54d86abdd7ef36356453d3703b
Component: engine
2014-10-30 18:01:01 -07:00
863c1e2270
Merge pull request #8866 from tonistiigi/fix-8832-logs-panic
...
Fix panic on slow log consumer.
Upstream-commit: aca253d6d0b84c74a32c624d7c39e3a5fcae7773
Component: engine
2014-10-30 17:40:46 -07:00
68f6d60698
Merge pull request #8510 from hqhq/graphdriver_bug
...
daemon: resolve the graphdriver to show
Upstream-commit: 793fb26bffd27f4db9324bc38f64fee78d5ba874
Component: engine
2014-10-30 17:40:30 -07:00
0d58dc079e
Change version to 1.3.1-dev
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: b9fcdb81917f2258b295a14398054b40bb6919b8
Component: engine
2014-10-30 19:45:07 -04:00
3770c8050c
Bump to version v1.3.1
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
VERSION
Upstream-commit: 4a17e6eeddee1fe13c7aa5ad7f6a789490add0fe
Component: engine
2014-10-30 19:44:54 -04:00
1b58e19e34
Fix login command
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 05c18a2434ab7bd68a86c87fe866bc7107ac1941
Component: engine
2014-10-30 19:44:44 -04:00
fce9329c80
Docs edits for dropping SSLv3 and under + release notes for 1.3.1
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
docs/sources/index.md
Conflicts:
docs/sources/index.md
Upstream-commit: e43d9f713e96daed521034995c00375544f62827
Component: engine
2014-10-30 19:44:42 -04:00
6d16ddef35
Do not verify certificate when using --insecure-registry on an HTTPS registry
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
registry/registry.go
registry/registry_test.go
registry/service.go
registry/session.go
Conflicts:
registry/endpoint.go
registry/registry.go
Upstream-commit: 6a1ff022b0744213ed588d9c16dbb13ce055eda6
Component: engine
2014-10-30 19:44:09 -04:00
ff11c586b2
Don't hard code true for auth job
...
Signed-off-by: Michael Crosby <michael@docker.com >
Conflicts:
registry/service.go
Upstream-commit: afade4236d3f15704653132c364d6e7ccc975f8b
Component: engine
2014-10-30 19:41:55 -04:00
3def82482e
Expand documentation for --insecure-registries
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 48f7384d6365c59b4b61d527630aaf88af24f6dd
Component: engine
2014-10-30 19:41:55 -04:00
2339e91d29
Refactor IsSecure change
...
Fix issue with restoring the tag store and setting static configuration
from the daemon. i.e. the field on the TagStore struct must be made
internal or the json.Unmarshal in restore will overwrite the insecure
registries to be an empty struct.
Signed-off-by: Michael Crosby <michael@docker.com >
Conflicts:
graph/pull.go
graph/push.go
graph/tags.go
Upstream-commit: f29b2e48ebfb171f58375b6e355910fc2192aceb
Component: engine
2014-10-30 19:41:55 -04:00
6b54bde512
make http usage for registry explicit
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Conflicts:
daemon/config.go
daemon/daemon.go
graph/pull.go
graph/push.go
graph/tags.go
registry/registry.go
registry/service.go
Upstream-commit: 380c8320a78dc16da65d9d13004422ac5a0cca53
Component: engine
2014-10-30 19:41:55 -04:00
7c5b52f9bd
Merge pull request #8867 from vbatts/vbatts-relocate_mount_operation
...
mount: move the MakePrivate to pkg/mount
Upstream-commit: 28af4a1efb25f5dff7a57b81cb51bf6fcf43d085
Component: engine
2014-10-30 16:39:20 -07:00
79bfa611f5
Wait for hijack on docker start command
...
With current implementation there was a possibility
that /start responds quicker than /attach, meaning that
some output would be clipped.
Fixed so the implementation matches with `docker run`.
This also fixes the flaky test results for TestCreateEchoStdout.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
Upstream-commit: 79a77a396e003d0f5827c48d1b179f87c1542311
Component: engine
2014-10-31 01:13:31 +02:00
4e9f4b9a1b
mount: move the MakePrivate to pkg/mount
...
The logic is unrelated to graphdriver.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 930a756ad55ad5f4e5e6391b41673743d7254c2b
Component: engine
2014-10-30 17:04:56 -04:00
4f3ca6500e
./pkg/archive: clean up Stat_t assertion
...
inspired by @tonistiigi comment
(https://github.com/docker/docker/pull/8046/files#r19579960 )
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 5e02468e76d61060f83a4d755b43f834981188f1
Component: engine
2014-10-30 16:50:33 -04:00
72f16e522e
Fix panic on slow log consumer.
...
Fixes #8832
All stdio streams need to finish writing before the
connection can be closed.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
Upstream-commit: c2cf97a0747976c2307e991028dc703b2b430d80
Component: engine
2014-10-30 22:24:57 +02:00
9d604d6213
Merge pull request #8822 from wilsaj/patch-2
...
Update host integration article
Upstream-commit: c3762c3abf0c217f5d84729cf15d00f9befc4815
Component: engine
2014-10-30 12:19:36 -07:00
4b66ac1426
Generalize consumeSlow and add stop support
...
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
Upstream-commit: 417e48e4a00c891e8fe5614ac6a1ef12de951f72
Component: engine
2014-10-30 21:11:33 +02:00
Peter Ericson
Malte Janduda
Doug Davis
Mengdi Gao
Médi-Rémi Hashim
Arnaud Porterie
Daniel, Dao Quang Minh
Derek McGowan
Fred Lifton
Jessie Frazelle
Srini Brahmaroutu
Michael Crosby
Erik Hollensbe
Victor Vieux
Thomas LEVEIL
Sebastiaan van Stijn
Huu Nguyen
Huu Nguyen
Huayi Zhang
Sven Dowideit
Lei Jitang
Scott Walls
Sven Dowideit
Tibor Vass
Michael Crosby
unclejack
Victor Vieux
Tonis Tiigi
Vincent Batts