toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,409 Commits 3 Branches 295 Tags
74f0d78beb2dc68ea7ca19df996bf95a6f625f81
Commit Graph
7409 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Vieux d6e39e4b66 Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 12687b7c10b6bb7e2a278ba6d1a323fe5e5f81d7
Component: engine
 2014-03-19 22:03:11 +00:00
Sven Dowideit 46fae9d52b Merge pull request #4703 from netroy/patch-1 
Document the missing `DisableNetwork` config flag to /containers/create end-point
Upstream-commit: 16ee4958f2d72e302350e659e2435cd31d8a28e5
Component: engine
 2014-03-20 07:55:35 +10:00
Guillaume J. Charmes 884fb2e9f1 Merge pull request #3774 from danielnorberg/dns-search-domains 
configurable dns search domains
Upstream-commit: 3c9ae2b3483bf89de4245884ff5e463dc35818f4
Component: engine
 2014-03-19 14:52:49 -07:00
unclejack f7bce0a8cc fix failing test to use kill instead of stop 
TestCreateStartRestartStopStartKillRm was failing because stop has been
changed to not kill containers.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4434dcee89f7d0d0239f6b492b24e940cdbafb21
Component: engine
 2014-03-19 23:23:45 +02:00
Vincent Batts 9fba82f5c1 api/client: var style tweak 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 78a0105eaf80ed85e2ee236632a2cc16998228f9
Component: engine
 2014-03-19 17:09:12 -04:00
Daniel Norberg be30df7e0d variable declaration cleanup 
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: c657603c612650117b4def976ff40d98ba7c3a21
Component: engine
 2014-03-19 16:44:11 -04:00
Daniel Norberg 57f5eae470 fix typo in documentation 
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: 698ca9f38d7ccee2c36b98821c74114b95db631b
Component: engine
 2014-03-19 16:44:09 -04:00
LK4D4 e64feaf637 Remove duplication of Dns in config merging. 
Fixes #4714
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 48cb2f03177732823b4091fd3ddd44b2bef2c58e
Component: engine
 2014-03-19 23:20:30 +04:00
Michael Crosby 3dcf98a6e1 Merge pull request #4777 from vbatts/vbatts-server-info_and_assurance 
images: assurance and debug info on image layers
Upstream-commit: 6b5ba1b06621ead46deb0e1ef52608e5e4724690
Component: engine
 2014-03-19 12:07:11 -07:00
Vincent Batts 2a0a13fcc3 docker save: add and improve docs 
add usage examples for `docker save ...`

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: e93a16ab48f75311aab155548f32776cbd21dfe6
Component: engine
 2014-03-19 14:47:20 -04:00
Vincent Batts 9788027867 images: assurance and debug info on image layers 
when pushing or saving layers, report sizes for validation. And ensure
that the files written are sync'ed.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 367a679b9270dd9ec6bd647998b6ffe594cfa6ab
Component: engine
 2014-03-19 14:34:12 -04:00
Vincent Batts 02cf69562f docker save: --output flag 
for those that do not care to redirect stdout

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 5127732c7911988c81eda7bb31ac77fc1dd36ac2
Component: engine
 2014-03-19 14:31:22 -04:00
Aditya 1ac2035314 Docker-DCO-1.1-Signed-off-by: Aditya <aditya@netroy.in> (github: netroy) 
document `DisableNetwork` config flag
Upstream-commit: ec3257921da9da0d37df76e26a842f8f4775def0
Component: engine
 2014-03-19 19:01:49 +01:00
Michael Crosby b5c2e757ec Merge pull request #4691 from tianon/relative-workdir 
Add proper support for relative WORKDIR instructions
Upstream-commit: 47470d299da4ade08bad4338c4dba4ceffacdce7
Component: engine
 2014-03-19 09:57:23 -07:00
Daniel Norberg c037f13ab8 configurable dns search domains 
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: fbfac21ed4de550ce72d993810dc07a2c4877a88
Component: engine
 2014-03-19 10:49:25 -04:00
James Turnbull 6aee2c6f6c Merge pull request #4754 from vojnovski/consistent_apt-key_use 
refactor($hack,$docs): be consistent in apt-key keyserver URI usage
Upstream-commit: d3c5891486a263d96db5b1f8e0f0e0f698ad168d
Component: engine
 2014-03-19 07:38:05 -06:00
Viktor Vojnovski 0ff768e136 refactor($hack,$docs): be consistent in apt-key keyserver URI usage, as done in #4740 
In #4740, the apt-key call in docs is changed to use the keyserver port 80 instead of
port 11371, as the previous call would fail with a restrictive firewall or proxy.
This commit extends the change to all apt-key calls in the repository.

Docker-DCO-1.1-Signed-off-by: Viktor Vojnovski <vojnovski@gmail.com> (github: vojnovski)
Upstream-commit: 4fd82db4beba03a126dfc557c86d5d52e9066dae
Component: engine
 2014-03-19 10:20:10 +01:00
James Turnbull bc7b9146dc Merge pull request #4727 from andreaturli/master 
add softlayer installation instructions
Upstream-commit: ccddb33bf493a1a6504c83b60812db4da3b130ff
Component: engine
 2014-03-19 01:04:44 -06:00
Sven Dowideit ee88186110 mention the tgz - other people might like to know 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 53dc2d67fb65037d9891e2fa0f6559d5e4e2ddcc
Component: engine
 2014-03-19 14:24:49 +10:00
Sven Dowideit dc7241d69b use this horrible complex bit of shell to make sure that curl doesn't hand the poor user a broken docker client 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 92194f613e37aeb8a387920c3bee42480da0d2ac
Component: engine
 2014-03-19 14:12:47 +10:00
Sven Dowideit a6d7cc047e Merge pull request #4758 from crosbymichael/redis-bind 
Be explicit about binding to all interfaces in redis example
Upstream-commit: 9bbc11b2aeb0652cf44f0bc583430b37356bef7c
Component: engine
 2014-03-19 13:04:02 +10:00
Michael Crosby e5eae6a723 Merge pull request #4753 from vieux/clean_container_stop 
cleanup container.stop
Upstream-commit: 0bb1e3d9a708d8b60e2efe3888fe9edef0574ac5
Component: engine
 2014-03-18 18:49:51 -07:00
Michael Crosby 6a56789e29 Be explicit about binding to all interfaces in redis example 
Fixes #4021

Moved to debian because the redis installed in ubuntu is really old
and does not support args via the cli.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7822b053cbd2288b6c8d9c51a8f495368bc77f35
Component: engine
 2014-03-18 17:24:06 -07:00
Sven Dowideit 0dd8fa46f2 Merge pull request #4757 from crosbymichael/osx-duh 
Add sudo clause if your using osx or tcp
Upstream-commit: 3b5b2f8953387077e4dabe53936bc5867e145ea0
Component: engine
 2014-03-19 10:22:30 +10:00
Michael Crosby 4caf655f4f Add sudo clause if your using osx or tcp 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 38a3fc3e0e9b56400b2c7d2fce3bfc7b15395d14
Component: engine
 2014-03-18 17:07:45 -07:00
Victor Vieux 9d78f7e8ee cleanup container.stop 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 3b1d590269466217ddf203edcef295f6cec9fcee
Component: engine
 2014-03-18 23:48:14 +00:00
Sven Dowideit 12ddd522ae Merge pull request #4755 from crosbymichael/add-size-to-history-docs 
Add image size to history docs
Upstream-commit: 9e1306f78f3d3856126955c1945a32eaf190d705
Component: engine
 2014-03-19 09:32:35 +10:00
Johan Euphrosine 433a941c61 libcontainer: remove duplicate imports 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 5dbfe310fe624c66714f8c5017692f528af4c87f
Component: engine
 2014-03-18 16:25:26 -07:00
Michael Crosby 2374c7e198 Add image size to history docs 
Fixes #3147
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 041ae08a2c8f6f345ac0d7f5fea4b79655e28dc5
Component: engine
 2014-03-18 16:24:45 -07:00
Johan Euphrosine bf68195445 libcontainer: goimports 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: f58757a699cf47c3b8770e13f371e1bbf493b5b1
Component: engine
 2014-03-18 16:18:34 -07:00
Johan Euphrosine 05b01b0f64 libcontainer/nsinit/init: move mount namespace after network 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: b10b950b110c93db34a399753706dc79c71b94d3
Component: engine
 2014-03-18 16:18:04 -07:00
Johan Euphrosine c37f607a5b libcontainer/network: add netns strategy 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: f52b2fdcbb29258c5b492fdb2479d473fcb42ca0
Component: engine
 2014-03-18 16:17:28 -07:00
Michael Crosby c9b7a0a568 Merge pull request #4744 from LK4D4/fix_issue_#3565 
Using names in docker ps --since-id/--before-id, resolves #3565
Upstream-commit: 22c18de7bed169792213843476d06dedbd1ba387
Component: engine
 2014-03-18 15:39:56 -07:00
Tianon Gravi f8d8a57e3d Merge pull request #4749 from cpuguy83/add_nofile_noproc_settings_to_upstart 
Add upstart nofile/noproc similar to systemd init
Upstream-commit: 119839dfd7b8b77eb22ccd45116f45a4bc17a1a6
Component: engine
 2014-03-18 15:30:30 -06:00
Sven Dowideit 7d90dd284a Merge pull request #4740 from vojnovski/patch-1 
Update ubuntulinux.rst
Upstream-commit: 06d87fd54009aa6a0d420e45bb8df11a7dea31c3
Component: engine
 2014-03-19 06:48:57 +10:00
Brian Goff 463aedf3de Add upstart nofile/noproc similar to systemd init 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: e27c635c06dcad61ce7185d95debef9ef7c9f7e0
Component: engine
 2014-03-18 16:27:20 -04:00
LK4D4 5ac53676ce Using names in docker ps --since-id/--before-id, resolves #3565 
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: c1f2abd89958a8731211ceb2885eed238a3bea8d
Component: engine
 2014-03-18 23:30:21 +04:00
Guillaume J. Charmes 9f3a8a726d Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop 
Disable automatic killing of containers when docker stop fails
Upstream-commit: bfbf338f51f90a67e2866358a33e22d576755439
Component: engine
 2014-03-18 11:28:42 -07:00
Michael Crosby 4879ef6f17 Merge pull request #4733 from vieux/3729_time_exit 
add time since exit in docker ps
Upstream-commit: 1e56ec8b67e77a1e99f12b7e7c04245477202c9c
Component: engine
 2014-03-18 11:25:11 -07:00
Victor Vieux eff77e2a3c Merge pull request #4650 from vbatts/vbatts-btrfs_build_tags 
btrfs: build tags
Upstream-commit: c584910b55969effc4fb6dfe3c5c4053f80e3aca
Component: engine
 2014-03-18 11:10:00 -07:00
Vincent Batts e8fa51d05e typo 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: c76def2dd23cf90fdc80224f08530205b6dcba73
Component: engine
 2014-03-18 13:46:38 -04:00
Vincent Batts 7a2dc6bc24 packagers: btrfs build tag docs 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 29c45e7f4fc616290e416f1b541e1739820af60c
Component: engine
 2014-03-18 13:45:36 -04:00
Vincent Batts 856d46eee0 btrfs: build tags 
correct filename and make the tag more readable

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 5cfea26bcfc218ca72eac7115fa257833f28b9f2
Component: engine
 2014-03-18 13:44:23 -04:00
Vincent Batts cdf7c6a1a7 btrfs: build tags 
Default to the same build behavior, but allow a go build tag to disable
building of the btrfs graphdriver

	go build -tags no_btrfs' ...
	$ go build
	$ objdump -S docker | grep btrfs | wc -l
	194
	$ go build -tags no_btrfs
	$ objdump -S docker | grep btrfs | wc -l
	1
	# that is a comment ;-)

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 85a62d9b779bfb351e159f38c2fc95900a0532cd
Component: engine
 2014-03-18 13:44:22 -04:00
Andy Kipp 7976f94412 Add err checks for port allocator tests 
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: 555416fd02b9e062385dcdaf0c4b9f5de61df388
Component: engine
 2014-03-18 13:30:21 -04:00
Andy Kipp 0ed607c3a6 Be more explicit in finding next port to allocate 
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: 73c416a20db8fe48302a6cf0db4c1c0585ed0739
Component: engine
 2014-03-18 13:30:21 -04:00
Andy Kipp 9ecda2cf3a Better test error message 
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: 7a1db291fcedd50ce99649e95109187c76da255c
Component: engine
 2014-03-18 13:30:21 -04:00
Andy Kipp dc2e6deab9 Prevent dynamic allocation of previously allocated ports 
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: f7b6fbbd7664634481c8519e58844d572423f3e1
Component: engine
 2014-03-18 13:30:21 -04:00
Victor Vieux afc3313920 Merge pull request #4674 from vbatts/vbatts-graphdriver_build_tags 
graphdriver: build tags
Upstream-commit: f14c0866ecb5ee38be8d6859ced730d431610743
Component: engine
 2014-03-18 10:25:59 -07:00
Guillaume J. Charmes 2e49d88eb6 Merge pull request #4739 from alexlarsson/dm-timeout 
devmapper: Increase timeout in waitClose to 10sec
Upstream-commit: 8ac6400749f6a000891b18ca1d36c10c8b7461d8
Component: engine
 2014-03-18 10:12:59 -07:00