toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,804 Commits 3 Branches 295 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph

20395 Commits

Author SHA1 Message Date
Erik Hollensbe
7a670a8ee2 Clean up the docker socket on termination of the daemon. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 96f1a990346b7702e6f3efee42389b2736dbb204
Component: engine
 2014-07-25 17:45:49 -07:00
Victor Vieux
2992095c71 Merge pull request #7251 from tiborvass/fix-test-import-display 
Fix test import display
Upstream-commit: 487a417d9fd074d0e78876072c7d1ebfd398ea7a
Component: engine
 2014-07-25 17:34:09 -07:00
James Turnbull
dd911c0f0c Merge pull request #7238 from dericcrago/patch-1 
apache2 was looking for two other directories
Upstream-commit: 1d21f75fa42cb51132c5c394987710b2200e7cb7
Component: engine
 2014-07-25 19:38:47 -04:00
Tibor Vass
1da81ba363 Fix io.Reader ambiguity on EOF in progressreader 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: caa57699283fd0fa47cac59c80adcacaa5c9950e
Component: engine
 2014-07-25 19:26:27 -04:00
Sven Dowideit
63a78b8fdf Merge pull request #7244 from anweiss/7243-dscarticle 
Updated DSC article to reflect changes in config
Upstream-commit: dacf9098702d0ee3dd969690f5f413666f341ffb
Component: engine
 2014-07-26 08:43:22 +10:00
Tibor Vass
f70f5a32c7 address a few nits 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: d082381a93810e6c386382f24da93518880e9250
Component: engine
 2014-07-25 18:29:47 -04:00
Michael Crosby
165da04561 Merge pull request #7166 from unclejack/maintainer_archive 
archive: add unclejack to MAINTAINERS
Upstream-commit: ec5b97ce9b4582745db45a9393e853df04b2ae9e
Component: engine
 2014-07-25 13:44:49 -07:00
Andrew Weiss
012e97ea38 updated article to reflect changes in config; fixed hyperlinks #7243 
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com> (github: anweiss)
Upstream-commit: 7a5db6df995a131579020fd2cbacd49cb82e0aea
Component: engine
 2014-07-25 15:49:33 -04:00
unclejack
3382b4e552 Merge pull request #7231 from vieux/allow_stack_trace 
allow sigquit to display stacktrace in debug mode
Upstream-commit: 7dde97640f9935c35104de6aa09dfcf33ba20ffc
Component: engine
 2014-07-25 21:34:25 +03:00
Tianon Gravi
420900ca68 Merge pull request #7227 from tianon/generate-authors 
Add new script to generate AUTHORS and regenerate AUTHORS (fixing a few new dups too)
Upstream-commit: 7756bcc7abe5d50f74ceebc4a6a7fc9c5ba1a0c7
Component: engine
 2014-07-25 12:31:47 -06:00
fcarriedo
81918c582c pkg/units: including suggestions and enhancements 
Docker-DCO-1.1-Signed-off-by: fcarriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: 2fb63aba0bf991873d56888f244d6aeee0c5fc57
Component: engine
 2014-07-25 09:33:04 -07:00
Johannes 'fish' Ziemke
3513533d24 Make sure err never gets masked 
Defining err as named return parameter will make sure the variable gets
assigned before returning and thus avoid masking

Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
Upstream-commit: 32bc8658793b278c793cb8755b94df3b210bea5d
Component: engine
 2014-07-25 17:00:41 +02:00
Deric Crago
fa3a5b81e8 apache2 was looking for two other directories 
/var/lock/apache2
/var/run/apache2
Upstream-commit: 3fb913ab7712634f1f311a9aab47c5eaa9f8fe9d
Component: engine
 2014-07-25 10:14:52 -04:00
Michiel@unhosted
154cd33cd7 Typo in dockervolumes.md line 141? 
Upstream-commit: 9503afbc9116b06585cf42715a7ae0bcd0fb7881
Component: engine
 2014-07-25 09:06:38 +02:00
Sven Dowideit
86189cd855 Merge pull request #7185 from thaJeztah/patch-1 
Fix incorrect path in ENTRYPOINT example
Upstream-commit: ff28b0b9194ffdad15ea459e123e2f5b674dc7e6
Component: engine
 2014-07-25 17:06:29 +10:00
Victor Vieux
ed094d474a allow sigquit to display stacktrace in debug mode 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 5b293f15967c3358b84fabd72723d4bb6571bae0
Component: engine
 2014-07-25 01:08:04 +00:00
unclejack
52dcbf17e9 archive: add unclejack to MAINTAINERS 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4fbc47e801531ae1738bb8d4cec0ee2450ccfcb9
Component: engine
 2014-07-25 02:07:40 +03:00
Tianon Gravi
d2405bde3d Add new script to generate AUTHORS and regenerate AUTHORS (fixing a few new dups too) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 771ed2391536ad722e32be519039454cc98668e8
Component: engine
 2014-07-24 16:49:39 -06:00
Victor Vieux
adbef64a84 revert AUTHORS changes 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 10822462624d9eb3e1801577540613d74b1bb225
Component: engine
 2014-07-24 22:30:05 +00:00
Victor Vieux
2273fb0f55 gofmt -s -w 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 5a0ef08c940b9a17c400389bca8e7f54935ceba9
Component: engine
 2014-07-24 22:25:29 +00:00
Victor Vieux
6ae4c9014c update go import path and libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
 2014-07-24 22:19:50 +00:00
fcarriedo
f664c76057 pkg/units: Updated Compile() to MustCompile() 
We were doing exactly what `regexp.MustCompile()` already does.

Docker-DCO-1.1-Signed-off-by: fcarriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: c765134ac954f54f8b6aca6df25cf5e28911b563
Component: engine
 2014-07-24 13:19:20 -07:00
Victor Vieux
213b4560ad Merge pull request #7212 from mheon/kill_zero 
Properly handle 0 being passed as a signal number
Upstream-commit: 2481e08e416d3cda0ed5ac73e6cbae99eea18414
Component: engine
 2014-07-24 11:42:16 -07:00
hollietealok
e57cffad17 Merge remote-tracking branch 'upstream/master' into doc_remove 
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com> (github: hollietealok)
Upstream-commit: 97283fa985623ca59183026a13951e7e9e6ce144
Component: engine
 2014-07-24 11:28:19 -07:00
James Turnbull
00689bb343 Added proposed Docker Community Guidelines 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 7365225957046cf6364b30c56f3585d9c29098e5
Component: engine
 2014-07-24 11:04:58 -07:00
Michael Crosby
47f3d8fd92 Merge pull request #7179 from LK4D4/add_cap_audit_write_#6345 
Add AUDIT_WRITE cap
Upstream-commit: 2ed10eae5b909ae1920f9dfba98b0a3b63ce29a9
Component: engine
 2014-07-24 10:02:44 -07:00
Matthew Heon
9c11a229c5 Properly handle 0 being passed as a signal 
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: be326b0ece345e7f28d663ac06c8614d58070326
Component: engine
 2014-07-24 11:06:20 -04:00
James Turnbull
0b23dd95aa Merge pull request #7199 from ipbabble/mp-changes 
Fixed some typos for '--' Vs '-' in docker-run-1.md
Upstream-commit: 0758acfb03a3a93903e0f4a109f6e9e30b07fbc1
Component: engine
 2014-07-24 06:51:56 -07:00
Sebastiaan van Stijn
53aae89bf0 Fix incorrect path in ENTRYPOINT example 
The ENTRYPOINT example uses "/usr/bin/ls" as path, but `ls` is located at `/bin/ls`.

Docker-DCO-1.1-Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (github: thaJeztah)
Upstream-commit: 2819d9b4062914daa5b6bd4d08676807859eae3f
Component: engine
 2014-07-24 14:48:23 +02:00
Alexandr Morozov
51f29305ff Test on building from GIT url 
Also I added fake git server to utils
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 5b0d4cf29629eabb8855400159c097cbd7502922
Component: engine
 2014-07-24 11:19:16 +04:00
Francisco Carriedo
22e53a9bae pkg/units: Refactored common code to single func 
Both functions perform the same logic and they just vary on the base
multiplication units. We can refactor the common code into a single
place.

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: 386d300a6e07c99380a0814497cf0bc672df1e63
Component: engine
 2014-07-24 00:03:59 -07:00
Francisco Carriedo
088f734e5e pkg/units: Moved 'units' out of function 
No need to initialize every time the function executes since it works as
a catalog.

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: e4ab996b9d0d97089b076cfef32405f5f3fedc7c
Component: engine
 2014-07-24 00:03:59 -07:00
Francisco Carriedo
23fcdf4f5e pkg/units: Compacted var declaration and initialization 
No need to have two lines. The type is even explicit when type casting
to `float64(size)`

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: d512294382c9013dee2820745db02ab63dc2ecdd
Component: engine
 2014-07-24 00:03:40 -07:00
Francisco Carriedo
9cee4d41c4 pkg/units: Refactor regexp.Compile to init() 
No need to recompile a fixed regular expression each time the function
executes. Abstracting it to the `init()` method.

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: a4d57d8a851bf288804215b39c9d56a51550a228
Component: engine
 2014-07-23 23:45:03 -07:00
Francisco Carriedo
fc192c453a pkg/units: Standardized supported sizes 
May make sense that both `FromHumanSize()` and `RAMInBytes()` support
the same units. Added 'PB' to the RAMInBytes regex.

Also updated tests.

Note: int64 is overflowed on quantities >= EB

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: 0fd37bd7ac0f92eda0a55cf2bedf77f1996b8472
Component: engine
 2014-07-23 23:37:06 -07:00
Tianon Gravi
44fd11bd23 Merge pull request #7148 from tianon/buildtags-docs 
Reorganize and clarify the DOCKER_BUILDTAGS docs
Upstream-commit: 9380e8cbe71f18f20293408246f3652e1c5c9b33
Component: engine
 2014-07-23 22:27:07 -06:00
Francisco Carriedo
1e857dc998 pkg/units: Using 'case' instead of trickled ifs 
Seems the perfect case for 'case' ;).

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: 03697f0a93b04122a5039db915afddf60ccec448
Component: engine
 2014-07-23 20:38:36 -07:00
Sven Dowideit
c9b056319d Merge pull request #7181 from timruffles/patch-3 
[DOCS] replace foo/bar with concrete names
Upstream-commit: bb6217c0556709c7e911faa8e968c3f72a38464d
Component: engine
 2014-07-24 12:26:10 +10:00
Victor Vieux
41e66d1933 Merge pull request #7108 from unclejack/archive_speedup 
speed up archive
Upstream-commit: 6b65e8817c76517b42264413e1aad4657fc3c1e0
Component: engine
 2014-07-23 16:54:35 -07:00
William Henry
c26325b9c4 Typo changes to docker-run-1.md - changing '-' to '--' where approp. 
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)
Upstream-commit: 140337296353b2dd37678b0e30cbf0ebe2cfd9e7
Component: engine
 2014-07-23 16:49:07 -04:00
Vincent Batts
a8f0d4ce31 Merge pull request #6727 from unclejack/improve_bytes_range 
Improve layer downloading
Upstream-commit: 683038bf57ce56c2f8eb433eb9bd00b2c17cae92
Component: engine
 2014-07-23 15:31:25 -04:00
hollietealok
39a4d3a21d Removed docker_io_oauth_api.md: Docker is not currently accepting registrations for third party auth while it's determined how this will be done, if at all, in the future. 
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com> (github: hollietealok)
Upstream-commit: 9fbae5924471b63e4f33fbd87f797183ab68be92
Component: engine
 2014-07-23 11:55:56 -07:00
Michael Crosby
b6bbf7e188 Merge pull request #7170 from unclejack/fix_testinspectlinksstopped 
integcli: fix TestInspectLinksStopped with Go1.3
Upstream-commit: 92cba0845c046c0dac2af74b5d717bc799c91984
Component: engine
 2014-07-23 11:19:11 -07:00
Victor Vieux
ed37d36716 Change version to 1.1.2-dev 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 56bb7ce780dc5fc2c5134291fbbea28169a479b1
Component: engine
 2014-07-23 18:09:02 +00:00
Michael Crosby
b62c8f48b7 Merge pull request #7164 from fcarriedo/not-error-as-var-name 
pkg/units: Better to not use `error` as var name
Upstream-commit: 604a975303230cec2684bfede67cedbd9bc50d4d
Component: engine
 2014-07-23 11:04:03 -07:00
James Turnbull
6dc7b294a3 Merge pull request #7180 from rhuss/patch-1 
Fixed parent-child relationship description
Upstream-commit: b9024174be37919e85c3127cf0d41f6d94d835c3
Component: engine
 2014-07-23 10:17:19 -07:00
Tim Ruffles
d72a089030 [DOCS] replace foo/bar with concrete names 
namespaces are not well documented, and I had to jump around to other docs. replacing `foo/bar` hopefully makes what's going on here a bit more obvious.

Docker-DCO-1.1-Signed-off-by: Tim Ruffles <timruffles@gmail.com> (github: timruffles)
Upstream-commit: 455e837e207a01153947fc81e3a22d6bb37d2c89
Component: engine
 2014-07-23 15:21:16 +01:00
Roland Huß
6f7c4cc1d5 Fixed parent-child relationship description 
"db" is the parent image, and "web" links to it as the child image. There was a typo in the document which reversed the relation.
Upstream-commit: 0a4b39b6a4e9faeea5d8c679e7b03e317a7b02f9
Component: engine
 2014-07-23 10:23:14 +02:00
Alexandr Morozov
da9850e0f6 Add AUDIT_WRITE cap 
Fixes #6345

Thanks @larsks for outstanding investigation

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 29ecc95c31ecfe15e3b3d8db94cea1c555e526a3
Component: engine
 2014-07-23 09:57:41 +04:00
SvenDowideit
a347eb0112 user facing documentation changes in master atm 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 5743cc3423b48a0a3c78c7640bb10d840c911604
Component: engine
 2014-07-23 12:40:10 +10:00