toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,114 Commits 3 Branches 295 Tags
12026cb912c7a677538cd2eb3340d70cb2dcca2b
Commit Graph
11114 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby 666bfb2887 Merge pull request #7957 from bfirsh/consistent-help-messages 
Consistent help messages
Upstream-commit: d9c7c1a7dadf1835587f993b7fe2029bb07f1ce0
Component: engine
 2014-09-11 15:25:28 -07:00
Jessica Frazelle ab21dc210b use correct apt-key for test.docker.io/ubuntu 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 440eb7fee88791d4f2f0866b04ff15253b6df8e9
Component: engine
 2014-09-11 15:22:36 -07:00
Michael Crosby d6e3f1dab9 Merge pull request #7996 from estesp/7943-validate-tagnames 
Validate tag names similar to repository name validation; add tests
Upstream-commit: 98e409172cb5872e0b081244bf8802e4a422d735
Component: engine
 2014-09-11 15:19:50 -07:00
Jessie Frazelle 9bdc95ea12 Merge pull request #7959 from crosbymichael/update-libcontainer-sep6 
Update libcontainer to 84ad9386a0240acb7475429a835
Upstream-commit: 2d4e43b26b93bb3c0e797fbf8b254077d6d7ed40
Component: engine
 2014-09-11 14:59:24 -07:00
Phil Estes 31470054b1 Validate tag names similar to repository name validation; add tests 
Addresses #7943

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 46eb4140c915e05a893080b34b42e25b6a75de7b
Component: engine
 2014-09-11 17:52:36 -04:00
Phil Estes 3be52d7f70 Match docs to actual port range used in code. 
Addresses #7985

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: d6f4b2ebb40ac79c3ba21e7196bba3b83124cf16
Component: engine
 2014-09-11 17:20:01 -04:00
Jessica Frazelle ad8c137992 Removing an image that fails, also removes the image name/tag. 
Fixes #7845 and #7801, and a real pain point I had :)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b2efdc538de47d37718b8972cd6703be32fc23c2
Component: engine
 2014-09-11 11:29:25 -07:00
Michael Crosby f59e13d587 Merge pull request #7202 from timbot/add-registry-mirror-flag 
Add daemon flag to specify public registry mirrors
Upstream-commit: ed7fb3bbdaa5cbce2563567eaa4cef67fc172270
Component: engine
 2014-09-11 11:11:01 -07:00
Michael Crosby 6a8c7d0e92 Merge pull request #7806 from erikh/fix_cmd_handling_in_parser 
Fix cmd and entrypoint handling in parser
Upstream-commit: 08f1a91ccd39a880645d4dbe8a45173f17cf42fe
Component: engine
 2014-09-11 10:42:22 -07:00
Jessie Frazelle 6f90c9a6ca Merge pull request #7984 from vbatts/vbatts-engine_env_comments 
engine.Env: comments and tests for Get()
Upstream-commit: e550fc532cd965ff109794452f0530fa4a1db232
Component: engine
 2014-09-11 10:19:58 -07:00
Doug Davis 17af1eaec1 Add notes about single-quotes 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b47a2fbdc545d649a945e78a22da0c5dd9df0921
Component: engine
 2014-09-11 10:19:07 -07:00
Erik Hollensbe 2d65e30419 builder: Fix an error check being done at the wrong spot in run 
dispatcher

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 91bed436215f272c2956abb969425ee0bfd3a998
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe 665c625297 move entrypoint integration-cli test for blank entrypoint to separate function 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 576416c99a0ae8ad27467f217ec21f598e4f4cc8
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe d8ce78da21 Do not populate path to prevent runconfig merge conflict; remove 
autoConfig seeding of entrypoint.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 92f885d7bd9d4a8f5d30ec650a7625a8727d952e
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe b3a58e1095 evaluator: ensure entrypoint stays blank if set blank while CMD is set. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 78a847a47ac777f4090c06a82e875ee30f9a1cbd
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe 76991d395e builder: Fix entrypoint and cmd semantics in evaluator. Test c/o @cnf 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: ac107995ae4a24195f8bb6b70c26393a87d19982
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe a3d374a131 builder: Fix a small bug that could improperly cache. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 3a6d1228a83ba0f9dd96138ccccfa758c0956a62
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe 35b33a60e1 builder/parser: fix handling of empty strings as the only argument. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 6b322ad2d32b1525ad01611f0d6ad8d803f5f6f0
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe c4ae3304f1 builder/parser/dumper: Handle newlines appropriately. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 234f0e4f79c27a4820f75a504fdcd45b2981a68a
Component: engine
 2014-09-11 06:00:24 -07:00
Lakshan Perera 9153ab8851 Fixed a typo in docs (outpu -> output). 
Signed-off-by: Lakshan Perera <lakshan@laktek.com>
Upstream-commit: 7b1fdd6c0460931d458703e175cba157de9b0246
Component: engine
 2014-09-11 09:09:59 +00:00
Abhinav Ajgaonkar 066f8a742f Update remote_api_client_libraries.md 
Adding docker rust client lib.

Signed-off-by: Abhinav Ajgonkar <abhinav316@gmail.com>
Upstream-commit: c7310b64637ae29a6d7a07b7e533a546e3524654
Component: engine
 2014-09-11 03:04:35 -04:00
Marko Tibold f444f23973 Fixed typo 
Upstream-commit: ef3920278e6a07254a6dcd9502254ed25656d552
Component: engine
 2014-09-11 08:55:45 +02:00
Vincent Batts 6556d7f015 engine.Env: comments and tests for Get() 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 6e0bc06018b28ac46689708343b8dd57cae772c2
Component: engine
 2014-09-10 22:20:49 -04:00
Vincent Batts 4dcbf56012 tarsum: TarSum is not the interface 
don't export the exsisting TarSum struct and call the interface 'TarSum'
instead.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: ec01eb653db9d5e5b9291c1670dde57e7f742874
Component: engine
 2014-09-10 21:56:20 -04:00
Sven Dowideit 68ab799b75 Merge pull request #7975 from passy/patch-2 
Fix link for configuring automated builds
Upstream-commit: 2d1c8bd78647162c7ea7d6bf9390a3d56305eb2d
Component: engine
 2014-09-11 09:16:41 +10:00
Michael Crosby 50b667fa91 Merge pull request #7689 from vbatts/vbatts-tarsum_versioning 
TarSum: versioning
Upstream-commit: 48fe9c108286f9d2a4fcb14f394d3d61bb1c983c
Component: engine
 2014-09-10 15:08:36 -07:00
Fred Lifton 5886dc651d Merge branch 'adding_official-repo-guidelines' of https://github.com/fredlf/docker into adding_official-repo-guidelines 
Conflicts:
	docs/sources/docker-hub/official_repos.md

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: dd5657ffd1a60fe89d57f585454a91823b2da516
Component: engine
 2014-09-10 14:30:19 -07:00
Fred Lifton 1fec550074 Fixes a couple small typos 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: a2ba4d56eb134f95eba790bb484e0c8bd77d1fc4
Component: engine
 2014-09-10 14:26:03 -07:00
Fred Lifton 80e042431f Merge pull request #1 from yosifkit/adding_official-repo-guidelines 
Fix formatting, change to markdown block for long
Upstream-commit: 0164cf0e9cd4d4262c477518b0968f4264975759
Component: engine
 2014-09-10 14:25:36 -07:00
Joe Ferguson 844e4f396f Fix formatting, change to markdown block for long 
Signed-off-by: Joe Ferguson <joe@infosiftr.com>
Upstream-commit: bcb9378c5b91f8fd7bc99d1ad0904f5cba6ee613
Component: engine
 2014-09-10 14:46:11 -06:00
Vincent Batts 5f275ccb1b TarSum: versioning 
This introduces Versions for TarSum checksums.
Fixes: https://github.com/docker/docker/issues/7526

It preserves current functionality and abstracts the interface for
future flexibility of hashing algorithms. As a POC, the VersionDev
Tarsum does not include the mtime in the checksum calculation, and would
solve https://github.com/docker/docker/issues/7387 though this is not a
settled Version is subject to change until a version number is assigned.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 747f89cd327db9d50251b17797c4d825162226d0
Component: engine
 2014-09-10 15:41:52 -04:00
Pascal Hartig 024af24baa Fix link for configuring automated builds 
Upstream-commit: ecbc8de2496bb8399a06defb5adfd0860adad788
Component: engine
 2014-09-10 21:08:05 +02:00
Michael Crosby 0d5a02c8f6 Merge pull request #7955 from LK4D4/ignore_delete_err_on_unmap_#7954 
Deallocate port before trying to delete iptables chain
Upstream-commit: 25f7840993b9f4ae47b900fcbde67fcd86d537ee
Component: engine
 2014-09-09 17:41:26 -07:00
Michael Crosby 765de5955d Merge pull request #7897 from LK4D4/refactoring_net_mode 
Add IsPrivate method for NetworkMode
Upstream-commit: f9c345ddfae25d5512b775968fb14ed1abb00504
Component: engine
 2014-09-09 14:20:59 -07:00
Alexandr Morozov 53bdf11639 Add IsPrivate method for NetworkMode 
This method indicates that container using private network stack

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 080ca8619172b020c7da29b46f2fe4c939bb47ca
Component: engine
 2014-09-10 00:46:43 +04:00
Alexandr Morozov 73455edf0c Deallocate port before trying to delete iptables chain 
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 2e7cf6b0cec3e5cc6f05fa5011cf7b5e49a44ae4
Component: engine
 2014-09-10 00:40:46 +04:00
Vincent Batts 1c4a4c9a65 Merge pull request #7921 from unclejack/increase_tarsum_buffer_size 
pkg/tarsum: make buffer size dynamic
Upstream-commit: 197f9b1e2b5810bbbd38b95b1d68c586033fad7c
Component: engine
 2014-09-09 16:10:02 -04:00
Tim Smith 0b07be83cc Add daemon flag to specify public registry mirrors 
Adds support for a --registry-mirror=scheme://<host>[:port]
daemon flag. The flag may be present multiple times. If
provided, mirrors are prepended to the list of endpoints used
for image pull. Note that only mirrors of the public
index.docker.io registry are supported, and image/tag resolution
is still performed via the official index.

Docker-DCO-1.1-Signed-off-by: Tim Smith <timbot@google.com> (github: timbot)
Upstream-commit: 69a75c673ccf0aebf19c7b350243f1b0cefad8be
Component: engine
 2014-09-09 19:03:38 +00:00
Michael Crosby dabdac7095 Merge pull request #7960 from vbatts/vbatts-tarsum_debugf_not_infof 
tarsum: use Debugf, not Infof
Upstream-commit: b5a4c70455019abe016d7880e0c01f1d1d7811ee
Component: engine
 2014-09-09 11:51:36 -07:00
Jessie Frazelle 791c25051e Merge pull request #7948 from SvenDowideit/add-more-port-specification-doc 
add -p PORT as a valid format specification
Upstream-commit: 2a832f617bb7db65aa083d73f650cb1ad756da1a
Component: engine
 2014-09-09 11:43:25 -07:00
Jessie Frazelle 114dd7f292 Merge pull request #7660 from rhatdan/selinux-volumes 
Change default label of container volumes to shared SELinux Label
Upstream-commit: 971240696f3fd74ece726245afd60bca1f86ecbc
Component: engine
 2014-09-09 11:16:19 -07:00
Vincent Batts 855ab1fce7 tarsum: use Debugf, not Infof 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 6a8cae3e03d7253f2013b6c56eef64b18aea038f
Component: engine
 2014-09-09 14:07:20 -04:00
Michael Crosby 2d85ff46a7 Update libcontainer to 84ad9386a0240acb7475429a835 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c604dc292e72c0cbb84184b92b4b2bd3631c862e
Component: engine
 2014-09-09 11:05:58 -07:00
Jessie Frazelle 7deecd3743 Merge pull request #7958 from dqminh/fix-lxc-template-console 
fix console attribute in lxc template
Upstream-commit: 49c32189c03a946479d04a65a9118b0251bd4586
Component: engine
 2014-09-09 11:00:48 -07:00
Daniel, Dao Quang Minh cf5c443ddd fix console attribute in lxc template 
commit 4aa5da278f49c889d43191f82ff42d3a95266d62 moves `Console` from Command to
ProcessConfig, but missed the change in lxc_template. Therefore creating a
container with tty using lxc driver with fail with error

template: lxc:60:20: executing "lxc" at <.Console>: Console is not a field of
struct type struct { *execdriver.Command; AppArmor bool; ProcessLabel string; MountLabel string }

This changes lxc_console template to refers to `.ProcessConfig.Console`

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: 4b3b54ca388cd49cd790def66fbce9af2be2f20f
Component: engine
 2014-09-09 13:51:13 -04:00
Ben Firshman fd1a27eae9 Consolidate documentation for -H option 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: fec81690ccaf4c4b81342f632bc1a3ec3ad6b86c
Component: engine
 2014-09-09 10:12:03 -07:00
James Turnbull da00deba3a Merge pull request #7953 from SvenDowideit/reformat-api-docs 
Reformat the API docs so I can read them
Upstream-commit: 1ed467a9aeb5323dfd457cecbd83cd1b5ef0a1af
Component: engine
 2014-09-09 12:52:26 -04:00
Jessie Frazelle ceeaadeef9 Merge pull request #7951 from taohu/typo 
typo fix: immediatly -> immediately
Upstream-commit: 17314e2fe894433936c1dd1f5f4af60d3a566270
Component: engine
 2014-09-09 09:44:51 -07:00
Dan Walsh 2a0b4ab45f Change default label of container volumes to shared SELinux Label 
Since these will be shared between containers we want to label
them as svirt_sandbox_file_t:s0.  That will allow multiple containers
to write to them.

Currently we are allowing container domains to read/write all content in
/var/lib/docker because of container volumes.  This is a big security hole
in our SELinux story.

This patch will allow us to tighten up the security of docker containers.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 73617e5e18159e5f791d2860c7857cd5dea31be4
Component: engine
 2014-09-09 08:18:20 -04:00
Sven Dowideit ec6681e63c Reformat the API docs so I can read them 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: f36dfbdcaf54ed01721f0871c26fe041c7c6bac0
Component: engine
 2014-09-09 16:17:38 +10:00