toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,885 Commits 3 Branches 295 Tags
325695b856ac2b565f6d059b90c7e32fe0f7caa4
Commit Graph
9885 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Hollensbe 325695b856 utils.Debugf -> log.Printf, move jsonlog to own package. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 5cdb9c8acab75df74d20cd937e4091dacb355160
Component: engine
 2014-08-06 16:39:01 -07:00
Erik Hollensbe 00eca7c915 utils/broadcastwriter -> pkg/broadcastwriter 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 5ab09f2f7129225220fc9c0b76b2e2aec6823ee1
Component: engine
 2014-08-06 16:37:01 -07:00
Michael Crosby c3c811b0a6 Merge pull request #7430 from tamsky/docfixes 
style, grammar, spelling fixes.
Upstream-commit: bc684fae642dbf585215b9518f469634a52a5524
Component: engine
 2014-08-06 16:11:52 -07:00
Michael Crosby 955fb61f46 Merge pull request #7431 from tamsky/fixes-7105 
add warning re: changing value of `dm.basesize`.
Upstream-commit: e86d87e1ce8c67f0463d76f6c438a19c859f1bd3
Component: engine
 2014-08-06 15:22:42 -07:00
Tianon Gravi 2ce4468307 Merge pull request #7428 from crosbymichael/update-libcontainer-aug2 
Update libcontainer to 5589d4d879f1d7e31967a927d3e
Upstream-commit: 8733cd7c0bc1224f9b50e3f9c0c1d86dac3f1add
Component: engine
 2014-08-06 15:41:35 -06:00
unclejack 23b10fab8b Merge pull request #7448 from tiborvass/fix-tmpdir-integration-tests 
Fix tmpdir integration tests
Upstream-commit: c9ca37dfe9c6050a290e52cad107bb8d4fd575bf
Component: engine
 2014-08-06 23:54:09 +03:00
Michael Crosby fa42c6f545 Merge pull request #27 from tianon/update-libcontainer 
Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice
Upstream-commit: 90da0884913b021b400202d2162aeafe1582f5ad
Component: engine
 2014-08-06 13:35:46 -07:00
Tibor Vass db456f6481 Fix integration tests by adding DOCKER_TMPDIR env in the test init function 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 872db07119e702424dc27cd6e3396b3f2109c468
Component: engine
 2014-08-06 15:55:50 -04:00
Tianon Gravi 7867156c6c Update vendor with the updated canonical deps from libcontainer 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: fba37a038d6053c272671ebc958b88f023bd221a
Component: engine
 2014-08-06 13:19:41 -06:00
Tianon Gravi a73db3dc5c Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 5101173e1fa5616768cb7a1b07f6c911f0f63658
Component: engine
 2014-08-06 13:18:24 -06:00
Tibor Vass ddc4e78a18 Fix TestBuildForbiddenContextPath after TMPDIR change 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 5e20b0027c19efdd83228cbbb9995847cb5cb8ed
Component: engine
 2014-08-06 14:24:00 -04:00
unclejack a223b80846 Merge pull request #6456 from rhatdan/tmpdir 
Docker should use /var/lib/docker/tmp for large temporary files.
Upstream-commit: 66c8f87e89ba0dd824cf640a159210fbbb8019ec
Component: engine
 2014-08-06 20:31:46 +03:00
Marc Tamsky a062aab14b add warning re: changing value of dm.basesize. 
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
Upstream-commit: bd30746e07e18942cea4f2d15a45fd357c957e4f
Component: engine
 2014-08-05 19:28:07 -07:00
Michael Crosby 17e78a7923 Update libcontainer to 5589d4d879f1d7e31967a927d3e 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 6215422286f59530e598b3317c9ea789f8c1d0c7
Component: engine
 2014-08-05 18:13:43 -07:00
Marc Tamsky 88553ea651 style, grammar, spelling fixes. 
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
Upstream-commit: 07099b62563f3201877995181825d4cd4822ed89
Component: engine
 2014-08-05 18:11:32 -07:00
Solomon Hykes 4e14138bbc Merge pull request #7186 from jamtur01/community 
Added proposed Docker Community Guidelines
Upstream-commit: 042b642d407fd9f76c7282fb71e1508bd033bfa1
Component: engine
 2014-08-05 15:44:11 -07:00
Michael Crosby 343e9e6a4a Merge pull request #7412 from bfirsh/rename-docker-config 
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
Upstream-commit: 0ea5160d2aff93f49f4288046de4c92727c2e097
Component: engine
 2014-08-05 14:52:28 -07:00
Dan Walsh 05babb14b7 Docker should use /var/lib/container/tmp for large temporary files. 
/tmp is often a tmpfs file system and large temporary files could cause
docker commands to fail.  Also using /tmp potentially allows users on the
system to get access to content, or even attack the content.  Moving the tmpdir to
/var/lib/container/tmp will protect the data.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)

Conflicts:
	docker/docker.go
Upstream-commit: b4813f2841638be28208b7b1602f12750a46ece9
Component: engine
 2014-08-05 16:43:42 -04:00
Michael Crosby 12ead53494 Merge pull request #6909 from LK4D4/prune_cmd_on_entrypoint_setting_#5147 
Cleanup cmd on entrypoint setting
Upstream-commit: 8f4b477c3263bc11c1ecc837d5a3f9aa663eff1c
Component: engine
 2014-08-05 11:50:18 -07:00
James Turnbull 6154307ce3 Merge pull request #7349 from knan-linpro/master 
networking.md: Networking between containers works without ip_forward
Upstream-commit: e47415d5f5182651c396bd4b4e5277195ee09d08
Component: engine
 2014-08-04 23:51:22 -04:00
Ben Firshman 3b38f1694c Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH 
DOCKER_CONFIG was introduced in #6984.

We may use "config" for other purposes (e.g. #7232). Until we
have made a design decision around how configuration files will
work, DOCKER_CERT_PATH is a much safer name to rely on for future
compatibility.

Docker-DCO-1.1-Signed-off-by: Ben Firshman <ben@firshman.co.uk> (github: bfirsh)
Upstream-commit: a49de2c46713149053b0ee25313c6f7a39273c25
Component: engine
 2014-08-04 17:36:53 -07:00
Michael Crosby 28202b64df Merge pull request #7377 from tianon/daemon-build-tag 
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
Upstream-commit: 3c1212ca3009dd5e8c89bfe6ab5bf42756c05da9
Component: engine
 2014-08-04 17:32:03 -07:00
Tianon Gravi 02a1f76d0b Merge pull request #7310 from stevecrozz/maintainers-grammar-update 
Correct grammar in MAINTAINERS.md
Upstream-commit: 6b94f2d9bece828f8959a51b34135f38c6ce5cc9
Component: engine
 2014-08-04 17:57:08 -06:00
Tianon Gravi 587342c3a2 Adjust build tags to be client-only in "make cross" too 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: ba663eac3a2deba4d89803453b07a09d8628f5f9
Component: engine
 2014-08-04 15:05:12 -06:00
Tianon Gravi 309f9edb73 Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable 
This works mostly by refactoring our "main" package to be careful about what it imports based on the daemon build tag. :)

Also, I've updated Travis to test "client-only" compilation after it tests the daemon version.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 1b95590d06b20b79041f6d23b9bc35612b82cb51
Component: engine
 2014-08-04 15:05:12 -06:00
Stephen Crosby e31ec5d7f0 Correct grammer in MAINTAINERS.md 
Signed-off-by: Stephen Crosby <stevecrozz@gmail.com>
Upstream-commit: 74212a15658a3f1c68a381a593488d7fda830272
Component: engine
 2014-08-04 13:37:01 -07:00
Tibor Vass bf1d90d442 Merge pull request #7388 from tianon/remove-pkg-system 
Purge the bits of pkg/system that moved to libcontainer/system
Upstream-commit: 0af135e9065562e14a77439e13a29b4f1eb627a0
Component: engine
 2014-08-04 15:49:13 -04:00
Michael Crosby fed88b0921 Merge pull request #7407 from crosbymichael/update-libcontainer-aug1 
Update libcontainer to version 68ea1234a0b046803aacb2562df0da1
Upstream-commit: 07fce305f74d786448ee5b2987493a16a840485f
Component: engine
 2014-08-04 12:37:13 -07:00
Michael Crosby 614ac47431 Ensure thread is locked in sysinit for docker 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: cd6b9038255be10d827972ea66c8878cf1d228dc
Component: engine
 2014-08-04 12:34:27 -07:00
Michael Crosby 3026860f67 Update libcontainer to 68ea1234a0b046803aacb2562df 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 22f373aeda63cffb06efca4fae067395191e02e9
Component: engine
 2014-08-04 12:34:11 -07:00
Alexandr Morozov c9f0913ee9 Inherit Cmd only if no --entrypoint specified on run 
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: aa2d6dbc0c64efb515646dd2d339ff857c94c3b7
Component: engine
 2014-08-04 21:17:37 +04:00
LK4D4 3ee2b7b6cb Cleanup Cmd on ENTRYPOINT instruction 
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1b6546b8407ce0fa41340efefc081beadf26d41c
Component: engine
 2014-08-04 20:48:36 +04:00
LK4D4 2b2d92d684 Remove redundant checks in runconfig.Merge 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 7dba5024e8cf152f8a597dd177485dbf9001ae58
Component: engine
 2014-08-04 20:48:09 +04:00
James Turnbull 88f677f31c Merge pull request #7391 from LK4D4/fix_relative_workdir_example 
Fix example of relative WORKDIR
Upstream-commit: d48492a12efa6e31bfcac6adb90f3afae0989fea
Component: engine
 2014-08-03 10:14:33 -04:00
Sven Dowideit e82585fe18 Merge pull request #7363 from lcoote/master 
#1852 Remote API documentation incorrect regarding private registries
Upstream-commit: 41a553ca35e272c89a2e668e4233d3042e141733
Component: engine
 2014-08-03 21:21:43 +10:00
LK4D4 7751a70b6e Fix example of relative WORKDIR 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 5514afcd88d40a7a9321a966292e9f724eeafc36
Component: engine
 2014-08-03 12:28:25 +04:00
Tianon Gravi 5c55cb7669 Purge the bits of pkg/system that moved to libcontainer/system 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 60341f80d7b7918d1c1eff7c38cbc55c9bdec4d9
Component: engine
 2014-08-02 01:35:04 -06:00
Michael Crosby 4ea9dad144 Merge pull request #7380 from tiborvass/merge-7368 
Accept vanilla Linux Foundation signoffs (Closes 7368)
Upstream-commit: bec676e2dea2b982a05b44f69844f55a4d543866
Component: engine
 2014-08-01 16:33:13 -07:00
Tibor Vass 946ba40611 Update CONTRIBUTING.md and test new DCO signature in this commit 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 6b04d597ee759ec72f95f9bde58716eda8495519
Component: engine
 2014-08-01 19:30:58 -04:00
Tibor Vass e68d8fa768 Accept vanilla Linux Foundation signoffs 
This allows signing off commits with `git commit -s`

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)

Cleaned up DCO regex
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 4909a702045e621f236f5ec5470c8a9ec7fd7022
Component: engine
 2014-08-01 19:30:34 -04:00
Victor Vieux 026a323acd Merge pull request #7385 from crosbymichael/return-content-type-error 
Return error for bad content-type
Upstream-commit: e9b4cafd8dc2429124b08c2694f20d196f42f533
Component: engine
 2014-08-01 16:30:18 -07:00
Michael Crosby 93ad6fba3d Check content type along with content length 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 8266c381d62a0790c489e27cc93ed8f4618d03c7
Component: engine
 2014-08-01 15:59:19 -07:00
Lachlan Coote 13e82ab047 #1852 Remote API documentation incorrect regarding private registries 
Issues addressed:

- Remote API doco refers to "registry" parameter which is not supported
- Neglects to mention "tag" parameter which is supported
- Offers no guidance on pushing to private registries

Changes made:

- As directed in review comments, `registry` removed from all api versions (1.0-1.14)
- Have added documentation for `tag` parameter and guidance on private registries for versions 1.10-1.14 (I have only validated this on .10)

Docker-DCO-1.1-Signed-off-by: Lachlan Coote <lachlan.t.coote@gmail.com> (github: lcoote)
Upstream-commit: a5c5dc121c794daa199a813a95c0affd766a18f4
Component: engine
 2014-08-01 15:58:01 -07:00
Michael Crosby 22a66332f2 Return error for bad content-type 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 78ac75fe00669f8d24ecab3273d47e805963e4d3
Component: engine
 2014-08-01 15:26:30 -07:00
Tibor Vass 0dc3563645 Merge pull request #7367 from ichik1/btrfs-is-not-experimental 
Btrfs graph driver is not experimental
Upstream-commit: ca602cd1e5b98c4fc82a50d3a03bcf6e22d9f67b
Component: engine
 2014-08-01 16:49:05 -04:00
Michael Crosby 576cbbee0d Merge pull request #7378 from rajdeepd/master 
Added test cases for no port, -ve port passed to nat.ParsePortSpecs 
Upstream-commit: 69aa07af1ef72f08b16f04010704ade669db28df
Component: engine
 2014-08-01 13:45:17 -07:00
Victor Vieux cb90ea993f Merge pull request #7379 from tiborvass/merge-7366 
Cleanup: merge container-related jobs into daemon/ (Closes 7366)
Upstream-commit: 867ffca84f3828d9d9a55d83bfe562cc221d0cc6
Component: engine
 2014-08-01 13:43:47 -07:00
Solomon Hykes 529952baed Cleanup daemon/Daemon.Install for readability 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: f46de04af65968f704f08681e4cf6c35e20b0697
Component: engine
 2014-08-01 14:25:02 -04:00
Solomon Hykes d37dbe0e16 Move "containers" to daemon/list.go 
This is part of an effort to break apart the deprecated server/ package

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: d0370076585f506d2f81af3fb3dab56119bdc0e9
Component: engine
 2014-08-01 14:24:58 -04:00
Solomon Hykes 021f4f3886 Move "top" to daemon/top.go 
This is part of an effort to break apart the deprecated server/ package

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: aa49632feff937287cd6f6413d665ec74f49779c
Component: engine
 2014-08-01 14:24:52 -04:00