Commit Graph

20395 Commits

Author SHA1 Message Date
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
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
d2356a19a6 Bump to version v1.3.1
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 4e9bbfa90054cd730e81b53b2de67a74306afc95
Component: engine
2014-10-30 09:44:46 -04:00
6c00f658a9 Fix login command
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: e6efbd659606386db4d0b83b98f9e189cf42595c
Component: engine
2014-10-30 09:17:11 -04:00
9872715c17 builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 9fc8b7f4e1f88d8573118b7300b18379072418d1
Component: engine
2014-10-30 09:17:11 -04:00
b3a290d7cc builder: whitelist verbs useful for environment replacement.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 463297ffe9d0b671d3b26e13905855ab3ff85d57
Component: engine
2014-10-30 09:17:11 -04:00
25ffa9fb6c builder: handle escapes without swallowing all of them.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 2dac82eb82b469f94ef26a153d2679663b048ad3
Component: engine
2014-10-30 09:17:11 -04:00
8329b37b51 builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 7f8cdeb18ba14502845efa7e7e90e913d2df23d2
Component: engine
2014-10-30 09:17:11 -04:00
3a00799059 Add docs for --dns-search=.
PR 6720 introduce that use `--dns-search=.` will not set `search` in `/etc/resolv.conf`.

Signed-off-by: Huayi Zhang <irachex@gmail.com>
Upstream-commit: 36ffbd7acf60d15942c0591bb4fec498f021331e
Component: engine
2014-10-30 21:04:35 +08: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
c55ffb34ca fix for iptables cleanup 8307
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: e171eda9989cb5d10e7fe14b258f239edb124541
Component: engine
2014-10-29 10:59:20 -07:00
6ab2c0d2ce Add test for #8307.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: d98b117962a7178154e775b8b283744841a10e3b
Component: engine
2014-10-29 10:59:20 -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
a5d878d96b Updated the COPY directive reference: Source can't be a URL for COPY (+ formatting error fixes)
Signed-off-by: Roman Dudin <katrmr@gmail.com>
Upstream-commit: ed5e776a2235dd185423749acb9b306bb6067945
Component: engine
2014-10-29 12:36:38 +03:00