clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 15:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,470 Commits 9 Branches 112 Tags
d94de133f4900509821cafb5208d91443119f809
Commit Graph
11470 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Vieux f95d73dfd4 add missing 'current filter' to ps 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-10-31 18:28:10 +00:00
Michael Crosby 0f9f5f3fdf Merge pull request #8839 from irachex/dns-search-doc 
Add docs for --dns-search=.
 2014-10-31 11:25:57 -07:00
Thomas LEVEIL 906985123a 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>
 2014-10-31 13:00:59 +00:00
Sebastiaan van Stijn 29965246a7 Typo in 1.3.1 change log 
Replaced envrionment -> environment

Signed-off-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
 2014-10-31 08:31:20 +01:00
Erik Hollensbe ad5b307d0f proxy: Fix a potential panic handling error states. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-31 04:20:26 +00:00
Huu Nguyen 8453cf0671 Remove out-of-context code block 
Signed-off-by: Huu Nguyen <whoshuu@gmail.com>
 2014-10-30 23:58:14 -04:00
Huu Nguyen b16f3736ed 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>
 2014-10-30 23:22:51 -04:00
Huayi Zhang eaa050fdb8 Mapping change in code 
Signed-off-by: Huayi Zhang <irachex@gmail.com>
 2014-10-31 09:57:54 +08:00
Sven Dowideit 107898a773 Merge pull request #8837 from sawalls/patch-2 
ubuntulinux.md - old commands, typo, section movement
 2014-10-30 18:48:24 -07:00
Lei Jitang d8b17d785a Fix docker exec command help messages 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2014-10-31 09:36:07 +08:00
Fred Lifton c2ff42552a Merge pull request #8873 from SvenDowideit/de-cleanup-Dockerfile 
Yes, the review really should have picked up this spelling mistake
 2014-10-30 18:32:28 -07:00
Scott Walls bc62a35ffb 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>
 2014-10-30 18:28:37 -07:00
Sven Dowideit bfe21f095d 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)
 2014-10-31 11:10:17 +10:00
Jessie Frazelle f68b8b33e6 Merge pull request #8850 from shuai-z/clean-mount 
Clear the internal state before raising error.
 2014-10-30 18:01:01 -07:00
Jessie Frazelle aca253d6d0 Merge pull request #8866 from tonistiigi/fix-8832-logs-panic 
Fix panic on slow log consumer.
 2014-10-30 17:40:46 -07:00
Jessie Frazelle 793fb26bff Merge pull request #8510 from hqhq/graphdriver_bug 
daemon: resolve the graphdriver to show
 2014-10-30 17:40:30 -07:00
Tibor Vass 6d6dc2c1a1 Merge pull request #8870 from tiborvass/merge_release_v1.3.1 
Merge release v1.3.1
 2014-10-30 20:24:34 -04:00
Tibor Vass b9fcdb8191 Change version to 1.3.1-dev 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-10-30 19:45:07 -04:00
Tibor Vass 4a17e6eedd Bump to version v1.3.1 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	VERSION
 2014-10-30 19:44:54 -04:00
Tibor Vass 05c18a2434 Fix login command 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-10-30 19:44:44 -04:00
Tibor Vass e43d9f713e 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
 2014-10-30 19:44:42 -04:00
Tibor Vass 6a1ff022b0 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
 2014-10-30 19:44:09 -04:00
Michael Crosby afade4236d Don't hard code true for auth job 
Signed-off-by: Michael Crosby <michael@docker.com>

Conflicts:
	registry/service.go
 2014-10-30 19:41:55 -04:00
Michael Crosby 48f7384d63 Expand documentation for --insecure-registries 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-10-30 19:41:55 -04:00
Michael Crosby f29b2e48eb 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
 2014-10-30 19:41:55 -04:00
unclejack 380c8320a7 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
 2014-10-30 19:41:55 -04:00
Victor Vieux 28af4a1efb Merge pull request #8867 from vbatts/vbatts-relocate_mount_operation 
mount: move the MakePrivate to pkg/mount
 2014-10-30 16:39:20 -07:00
Tonis Tiigi 79a77a396e 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)
 2014-10-31 01:13:31 +02:00
Vincent Batts 930a756ad5 mount: move the MakePrivate to pkg/mount 
The logic is unrelated to graphdriver.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-10-30 17:04:56 -04:00
Vincent Batts 5e02468e76 ./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>
 2014-10-30 16:50:33 -04:00
Tonis Tiigi c2cf97a074 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)
 2014-10-30 22:24:57 +02:00
Fred Lifton c3762c3abf Merge pull request #8822 from wilsaj/patch-2 
Update host integration article
 2014-10-30 12:19:36 -07:00
Michael Crosby d0197f4f7e Merge pull request #8856 from unclejack/reexec_pkg 
pkg/reexec: move reexec code to a new package
 2014-10-30 12:14:37 -07:00
Tonis Tiigi 417e48e4a0 Generalize consumeSlow and add stop support 
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
 2014-10-30 21:11:33 +02:00
Tonis Tiigi 8a81c46272 Move consumeSlow() under test utils 
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
 2014-10-30 20:55:08 +02:00
Andy Wilson 9542ea7218 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>
 2014-10-30 13:39:45 -05:00
Huayi Zhang 36ffbd7acf 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>
 2014-10-30 21:04:35 +08:00
unclejack acd64278f1 pkg/reexec: move reexec code to a new package 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-10-30 14:48:30 +02:00
James Turnbull b63a254522 Merge pull request #8747 from SvenDowideit/lets-tell-them-more-about-exec 
Add a link to some documentation about exec.
 2014-10-30 07:56:55 -04:00
shuai-z 05ff40b07a 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>
 2014-10-30 13:31:19 +08:00
Sven Dowideit 74564e51ad Merge pull request #8500 from fredlf/style-guide 
Adds new Docs Style Guide.
 2014-10-29 17:26:29 -07:00
Fred Lifton 461d33eeb0 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)
 2014-10-29 16:43:58 -07:00
Victor Vieux 265a89a605 Merge pull request #8387 from vbatts/vbatts-registry_test_enpoint 
registry/endpoint: make it testable
 2014-10-29 13:36:17 -07:00
unclejack 73057168fa Merge pull request #8046 from vbatts/vbatts-archive_preserve_hard_links 
archive: preserve hardlinks in Tar and Untar
 2014-10-29 22:04:23 +02:00
Jessie Frazelle 565340c90c Merge pull request #8669 from monsterzz/8668-dualstack-registry 
Use dual-stack Dialer when talking to registy
 2014-10-29 12:03:12 -07:00
Vincent Batts f14a9ed011 archive: cleanup and more information 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2014-10-29 14:52:59 -04:00
Vincent Batts f710a8d774 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>
 2014-10-29 14:52:59 -04:00
Vincent Batts f9f8044363 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>
 2014-10-29 14:52:52 -04:00
Jessie Frazelle f936a10d80 Merge pull request #8571 from ncdc/3631-stdout-premature-eof 
Fix stdout premature EOF
 2014-10-29 11:36:32 -07:00
Jessica Frazelle e171eda998 fix for iptables cleanup 8307 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-29 10:59:20 -07:00