0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11354 commits 14 branches 412 tags 338 MiB
Commit graph

11354 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
Tibor Vass
006d2334d1 Merge pull request #8846 from LK4D4/fix_compilation 
Fix compilation issue bringed by #8319
 2014-10-29 12:50:53 -04:00
Alexandr Morozov
4da2572424 Fix compilation issue bringed by #8319 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-29 09:31:35 -07:00
Jessie Frazelle
fd19e473fc Merge pull request #8319 from MalteJ/ipv6-ipallocator 
Implementing IPv6 functionality for ipallocator
 2014-10-29 09:20:52 -07:00
Sven Dowideit
7d538542ca Merge pull request #8790 from cloojure/patch-2 
Update faq.md
 2014-10-28 19:55:00 -07:00
Sven Dowideit
f1ddda6cf7 Merge pull request #8808 from nhsiehgit/dockerfiletut 
changed dockerfile back button to look nicer
 2014-10-28 19:41:18 -07:00
Tibor Vass
290222c3dd Merge pull request #8352 from zachborboa/patch-1 
Fix typo
 2014-10-28 22:39:05 -04:00
Solomon Hykes
f0327c99dd Merge pull request #8198 from jfrazelle/add-jessie-to-various-maintainers 
Adding self to various maintainers files.
 2014-10-28 19:35:28 -07:00
James Turnbull
e11dd26a6c Merge pull request #8734 from alex/patch-2 
Replace fast with quickly
 2014-10-28 22:11:43 -04:00
Sven Dowideit
90221e28d6 Merge pull request #8646 from ndeloof/patch-3 
Update docker_remote_api.md
 2014-10-28 19:08:55 -07:00
James Turnbull
75ae546377 Merge pull request #8750 from matm/patch-2 
dockerimages.md: typo fix
 2014-10-28 22:04:43 -04:00
James Turnbull
01454a50cc Merge pull request #8762 from fredlf/tutorial-tweaks 
Tweaks to Dockerfile tutorial
 2014-10-28 22:04:23 -04:00
Michael Crosby
9d65017069 Merge pull request #8836 from jfrazelle/hub-login-error 
Fix error on successful login.
 2014-10-28 18:09:17 -07:00