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
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
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
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
55acba12a1
Move consumeSlow() under test utils
...
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
Upstream-commit: 8a81c462722c7158e481f974f628843e7c172158
Component: engine
2014-10-30 20:55:08 +02:00
59014e2c8a
doc: Update host integration article
...
Update for changes in docker 1.2. Running the docker daemon with "-r=false" has been deprecated in favor of per-container restart policies.
Signed-off-by: wilsaj <wilson.andrew.j+github@gmail.com >
Upstream-commit: 9542ea72188614d5b14f9e7fc31c80e6425738c4
Component: engine
2014-10-30 13:39:45 -05:00
3dbfc4607d
pkg/reexec: move reexec code to a new package
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: acd64278f13ef0ee565f4819951393b9c3fe89eb
Component: engine
2014-10-30 14:48:30 +02:00
abcf5d1b6e
Merge pull request #8747 from SvenDowideit/lets-tell-them-more-about-exec
...
Add a link to some documentation about exec.
Upstream-commit: b63a254522319b9f49cb45f15689968405cf9045
Component: engine
2014-10-30 07:56:55 -04:00
db52b288f0
Clear the internal state ourselves before raising error.
...
If we need to raise an error, make sure the internal state is clean, because
a successful driver.Get() may have its internal state changed (eg. counting,
or mounts), while callers will only do that after a succussful Mount().
Signed-off-by: shuai-z <zs.broccoli@gmail.com >
Upstream-commit: 05ff40b07a5857b41e17290e1d7cef516f122d6c
Component: engine
2014-10-30 13:31:19 +08:00
6261aec6ba
Adds new Docs Style Guide.
...
Includes changes to mkdocs yml and removes style info from docs Read Me, adding a link instead.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Conflicts:
docs/README.md
Revisions to style guide based on review.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
More Style Guide revisions based on review.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
A few more style guide copy edits
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 461d33eeb0fe1058c9fcea39124c2d1f9e141765
Component: engine
2014-10-29 16:43:58 -07:00
6c8d4b4efb
Merge pull request #8387 from vbatts/vbatts-registry_test_enpoint
...
registry/endpoint: make it testable
Upstream-commit: 265a89a605ad6cdbd6abb85804644f4fd3f30050
Component: engine
2014-10-29 13:36:17 -07:00
842e60dcd8
Merge pull request #8046 from vbatts/vbatts-archive_preserve_hard_links
...
archive: preserve hardlinks in Tar and Untar
Upstream-commit: 73057168fa6f8852c52cdc92f790446da865f2e7
Component: engine
2014-10-29 22:04:23 +02:00
2bfa151ffc
Merge pull request #8669 from monsterzz/8668-dualstack-registry
...
Use dual-stack Dialer when talking to registy
Upstream-commit: 565340c90c2e3402369224450807a047481d9efa
Component: engine
2014-10-29 12:03:12 -07:00
7239493b34
archive: cleanup and more information
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com >
Upstream-commit: f14a9ed011d9b73104631310a13eab447d53be3a
Component: engine
2014-10-29 14:52:59 -04:00
c5a11d2981
archive: example app for diffing directories
...
By default is a demo of file differences, but can be used to create a
tar of changes between an old and new path.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com >
Upstream-commit: f710a8d7746df5f54e2cbe7b90885e4eb75920b4
Component: engine
2014-10-29 14:52:59 -04:00
87d83cfa00
archive: preserve hardlinks in Tar and Untar
...
* integration test for preserving hardlinks
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com >
Upstream-commit: f9f80443638fc2d703ee6205c8ef3db8e38db9a3
Component: engine
2014-10-29 14:52:52 -04:00
08749b6912
Merge pull request #8571 from ncdc/3631-stdout-premature-eof
...
Fix stdout premature EOF
Upstream-commit: f936a10d8048f471d115978472006e1b58a7c67d
Component: engine
2014-10-29 11:36:32 -07:00
28bd6d74bf
Fix compilation issue bringed by #8319
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 4da25724248d988771c2a546aa065505ceb24038
Component: engine
2014-10-29 09:31:35 -07:00
0a96e49cc3
Merge pull request #8319 from MalteJ/ipv6-ipallocator
...
Implementing IPv6 functionality for ipallocator
Upstream-commit: fd19e473fc81c8b58d82b1b77cd992c43faa64a8
Component: engine
2014-10-29 09:20:52 -07:00
ff26af6419
Merge pull request #8790 from cloojure/patch-2
...
Update faq.md
Upstream-commit: 7d538542ca53488f32db377984b7917480d60917
Component: engine
2014-10-28 19:55:00 -07:00
648f649fec
Merge pull request #8808 from nhsiehgit/dockerfiletut
...
changed dockerfile back button to look nicer
Upstream-commit: f1ddda6cf735e214a3980a000b1cbfb0d893e38a
Component: engine
2014-10-28 19:41:18 -07:00
631e8d7105
Merge pull request #8352 from zachborboa/patch-1
...
Fix typo
Upstream-commit: 290222c3ddbdfb871f7fa088b8c724b9970a75ba
Component: engine
2014-10-28 22:39:05 -04:00
54a35eb340
Merge pull request #8198 from jfrazelle/add-jessie-to-various-maintainers
...
Adding self to various maintainers files.
Upstream-commit: f0327c99dd6fb7353d76726e0adb67a1b5a98451
Component: engine
2014-10-28 19:35:28 -07:00
5a702f62c8
Merge pull request #8734 from alex/patch-2
...
Replace fast with quickly
Upstream-commit: e11dd26a6cbdbaa442fbf5eca6cb05270ed21ae6
Component: engine
2014-10-28 22:11:43 -04:00
1b7aca4d0a
Merge pull request #8646 from ndeloof/patch-3
...
Update docker_remote_api.md
Upstream-commit: 90221e28d61ed2a71ebbc8160d60156b8145dc43
Component: engine
2014-10-28 19:08:55 -07:00
088e4a75d9
Merge pull request #8750 from matm/patch-2
...
dockerimages.md: typo fix
Upstream-commit: 75ae54637778e98e06200d2a02afcab6902805aa
Component: engine
2014-10-28 22:04:43 -04:00
025009b453
Merge pull request #8762 from fredlf/tutorial-tweaks
...
Tweaks to Dockerfile tutorial
Upstream-commit: 01454a50cc3fe2bd5a86befa69427dc2bbaa604e
Component: engine
2014-10-28 22:04:23 -04:00
fbef49310d
Fix error on successful login.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 35703d4f0c79e936bbff1804167ae9e8dde9b76c
Component: engine
2014-10-28 17:42:03 -07:00
e218058e35
Merge pull request #8833 from jfrazelle/revert-gccgo-changes
...
Revert gccgo changes
Upstream-commit: 674e11183a32d803d81d3a7bedee5ee96d7cb68a
Component: engine
2014-10-28 16:44:39 -07:00
08135c6c86
Revert "finally, use code generation for INITSHA1 & INITPATH too"
...
This reverts commit c7c620dd9fce0e7b437ee185c7a58341f3b8e3aa.
Conflicts:
.gitignore
hack/make.sh
hack/make/dynbinary
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7041eb00be7d6224aeedf7db317667b1d121b54d
Component: engine
2014-10-28 16:29:01 -07:00
712adb4068
Revert "use code generation for GITCOMMIT/VERSION too"
...
This reverts commit 85744a35de0e30c2dd6741b833f38ff218c8a3fc.
Conflicts:
.gitignore
hack/make.sh
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: ec1420cc2b228116d4aa9c812bd98fa8acdc1b98
Component: engine
2014-10-28 16:27:23 -07:00
5e6433dd55
Merge pull request #8717 from yosifkit/docs-dockerfile
...
Cleanup docs Dockerfile, so it matches best practices.
Upstream-commit: 321c85d03d925ceef7fc4ddec95f11b4133d8319
Component: engine
2014-10-28 16:25:50 -07:00
7c82a1653d
Revert "Use code generation to set IAMSTATIC instead of -X"
...
This reverts commit 3e10b93106dea94e5747ab32fe4ac765aa22f9bc.
Conflicts:
.gitignore
hack/make.sh
hack/make/dynbinary
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 17e0a15386c2a2ff01417d66e37683bd9a2a79c8
Component: engine
2014-10-28 16:25:50 -07:00
5243fb8cd6
Update libcontainer f60d7b9195f8dc0b5d343abbc3293d
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 622e1005530eada61675e533d3993d7df6c21186
Component: engine
2014-10-28 22:19:01 +00:00
ec0d91155f
Merge pull request #8772 from aluzzardi/docker-info-mem-cpu
...
Expose # of CPUs and memory available on docker info.
Upstream-commit: eb1b785e67784ccc9b521566fbc1737d6177d9ad
Component: engine
2014-10-28 14:14:10 -07:00
3de9330fda
changed dockerfile back button to look nicer
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: 7597f27276b1c47da05ad1ae0bbcca21e080d9a7
Component: engine
2014-10-28 11:52:49 -07:00
