toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,392 Commits 3 Branches 295 Tags
c9daf4dfd5767ee3ff6cd76905df7d7c63ba3eb6
Commit Graph
11392 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
unclejack 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
Victor Vieux 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
Vincent Batts 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
Vincent Batts 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
Tonis Tiigi 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
Fred Lifton 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
Michael Crosby 0042ce4cd2 Merge pull request #8856 from unclejack/reexec_pkg 
pkg/reexec: move reexec code to a new package
Upstream-commit: d0197f4f7ee88be50d0502e5397fbec6231c3fdc
Component: engine
 2014-10-30 12:14:37 -07:00
Tonis Tiigi 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
Tonis Tiigi 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
Andy Wilson 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
Huayi Zhang 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
unclejack 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
James Turnbull 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
shuai-z 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
Sven Dowideit fc01298739 Merge pull request #8500 from fredlf/style-guide 
Adds new Docs Style Guide.
Upstream-commit: 74564e51ad0269a6d3aa4290c6c070b8f249f1cd
Component: engine
 2014-10-29 17:26:29 -07:00
Fred Lifton 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
Victor Vieux 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
unclejack 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
Jessie Frazelle 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
Vincent Batts 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
Vincent Batts 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
Vincent Batts 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
Jessie Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Tibor Vass 708c2cf31e Merge pull request #8846 from LK4D4/fix_compilation 
Fix compilation issue bringed by #8319
Upstream-commit: 006d2334d1e5eb7d29d16290b20ae376d8b1beb8
Component: engine
 2014-10-29 12:50:53 -04:00
Alexandr Morozov 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
Jessie Frazelle 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
Sven Dowideit 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
Sven Dowideit 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
Tibor Vass 631e8d7105 Merge pull request #8352 from zachborboa/patch-1 
Fix typo
Upstream-commit: 290222c3ddbdfb871f7fa088b8c724b9970a75ba
Component: engine
 2014-10-28 22:39:05 -04:00
Solomon Hykes 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
James Turnbull 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
Sven Dowideit 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
James Turnbull 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
James Turnbull 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
Michael Crosby 3b9414956c Merge pull request #8836 from jfrazelle/hub-login-error 
Fix error on successful login.
Upstream-commit: 9d65017069ff12fbf0a6f078ccf91bce42fc8ffb
Component: engine
 2014-10-28 18:09:17 -07:00
Jessica Frazelle 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
Alexandr Morozov 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
Jessica Frazelle 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
Jessica Frazelle 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
Sven Dowideit 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
Jessica Frazelle 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
Michael Crosby 862c4beedc Merge pull request #8828 from crosbymichael/update-libcontainer-oct4 
Update libcontainer to f60d7b9195f8dc0b5d343abbc3293d
Upstream-commit: d176d1bfb4b59c5f1dcdebd42a8e22887ea1b80f
Component: engine
 2014-10-28 16:14:28 -07:00
Michael Crosby 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
Jessie Frazelle 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
Nathan Hsieh 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
Tibor Vass a8e026c677 Merge pull request #8806 from takama/ioreader 
excluding unused transformation to []byte
Upstream-commit: 29ebb53b522436b9f405b36616a1eeec8b087d2b
Component: engine
 2014-10-27 20:58:53 -04:00
Sven Dowideit b12f16ce86 Merge pull request #8807 from erikh/builder_docs 
builder: Update documentation WRT environment replacement
Upstream-commit: 413f2efba10ac6036c14cf495e2fbb16c1462764
Component: engine
 2014-10-27 17:40:09 -07:00
Erik Hollensbe 57b27c44c9 builder: Update documentation WRT environment replacement 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: e377716b377ccc4854f810bbfc3e65a7858163ed
Component: engine
 2014-10-27 23:37:27 +00:00