toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,781 Commits 3 Branches 295 Tags
0c3330ed80c8d7d459e53fd258ff189def3136a0
Commit Graph
9781 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass 3fc02efa64 Merge pull request #7209 from LK4D4/test_build_from_git 
Test on building from GIT url
Upstream-commit: da40d9b7a50704b0ff28f885dc4e87ffb77cd01b
Component: engine
 2014-07-28 11:15:50 -04:00
unclejack 4eed6ed770 Merge pull request #7097 from LK4D4/fix_eof_dockerignore_#7093 
Skip whole dir dockerignoring with warning
Upstream-commit: 7978b3212789203ffe75af60792d85132fb1c519
Component: engine
 2014-07-28 17:34:44 +03:00
r0n22 eec1c749e5 Update HTTP Proxy Section 
Docker.service file location was missing the /usr dir.
Upstream-commit: 2095e22121833e5d38890c321a7a67ead405e3ec
Component: engine
 2014-07-28 09:39:55 -04:00
Sébastien Luttringer 4569bccd5e Systemd service should not restart on failure 
This should not be done by default but used by adminsys with a drop-in.d file,
for buggy daemons which crash without known fixes.

Docker-DCO-1.1-Signed-off-by: Sébastien Luttringer <seblu@seblu.net> (github: seblu)
Upstream-commit: 533916fa6bb0b19fb887b5b0b2b704b224154b41
Component: engine
 2014-07-28 11:50:24 +02:00
Sébastien Luttringer d687489711 Systemd .service should install .socket 
And remove the WantedBy directive.

See: https://bugs.archlinux.org/task/41338

Docker-DCO-1.1-Signed-off-by: Sébastien Luttringer <seblu@seblu.net> (github: seblu)
Upstream-commit: 0f26195a8ddd0bde95865816576d827a9ed0727c
Component: engine
 2014-07-28 00:18:14 +02:00
Sébastien Luttringer e1fb484158 Fix ordering in systemd service file 
See: https://bugs.archlinux.org/task/41338

Docker-DCO-1.1-Signed-off-by: Sébastien Luttringer <seblu@seblu.net> (github: seblu)
Upstream-commit: fe68df36fc9c85ae30af9bf53a13e8af0534e613
Component: engine
 2014-07-28 00:17:40 +02:00
Francisco Carriedo f378b5d004 pkg/units: Updated tests with unit constants 
Also, now that I was at it, gave them a small refactor.

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: 81c7d28b842844778a652b7353f52332f4276afb
Component: engine
 2014-07-26 20:00:18 -07:00
Francisco Carriedo 3b6e93d717 pkg/units: Unit constants directly int64 
int64 seems sufficient

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: c7a2e86b5186acb58999d7b2b3a85a9bb4421b1f
Component: engine
 2014-07-26 20:00:08 -07:00
unclejack 79b92f27aa bump Go to 1.3 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: d0a0e91f1f8c3a43f04e7a58e37498124b283594
Component: engine
 2014-07-26 21:33:31 +03:00
Tibor Vass 7e29f226f3 Kill all concurrent jobs on error 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 4cfe806db2a41a97079a4881d4a0099a7b5b8149
Component: engine
 2014-07-26 13:45:35 -04:00
Tianon Gravi 36c95b11f7 Fix precompiled unit tests needing their "testdata" contents 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0a7cd70924178304d1919ae5ea2cc86620f2be54
Component: engine
 2014-07-26 11:46:52 -04:00
Tibor Vass 34f8b9c1af remove temporary line in Dockerfile that prevented cache miss 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 81e78db507c7523696b4115b5675170925a417e9
Component: engine
 2014-07-26 11:46:52 -04:00
Tianon Gravi de5528653f Add a bunch more tweaks to the parallel test compilation 
- put all the precompiled test binaries in $DEST so they show up in bundles and can be re-run individually afterwards
- support cases where parallel is not installed (when using dyntest-unit, for example, this is much more common, since it's designed to be run outside the Dockerfile)
- use "mktemp -d" instead of "/tmp" directly for our temporary parallel HOME
- update the default PARALLEL_JOBS to be the value of "nproc" instead of 0, since "0 means as many as possible" (see https://www.gnu.org/software/parallel/man.html#jobs_n)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: a6085fd430e8f155e4a0738de752df3c77bc132f
Component: engine
 2014-07-26 11:46:36 -04:00
Tibor Vass 3247893959 benign whitespace change 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 3a1385702cdd69a0b85b726dac6e749eb0e97fc1
Component: engine
 2014-07-26 11:46:36 -04:00
Tibor Vass e0a3dfaf31 compile unit tests in parallel with GNU parallel 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 158e3068bda22ee09b00d37b3e4b33e42ecced1b
Component: engine
 2014-07-26 11:46:36 -04:00
Julien Bordellier 122772c096 Adding the query parameters to insert api call for all <= 1.10 and 
removing the insert documentation for > 1.10 since it has been removed
in 1.11. This commit fixes #7183
Docker-DCO-1.1-Signed-off-by: Julien Bordellier <me@julienbordellier.com> (github: jstoja)
Upstream-commit: 2d84b877bdce5e26aac164e14815e1c4fa8648b7
Component: engine
 2014-07-26 13:03:04 +02:00
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
James Turnbull a1541fc2ac Merge pull request #7234 from michielbdejong/patch-1 
Typo in dockervolumes.md line 141?
Upstream-commit: c028bb239ffcd76a3812c82f75bcfc8083e7632c
Component: engine
 2014-07-25 13:14:50 -04: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
Victor Vieux a808375eeb Merge pull request #7225 from vieux/update_path 
update go import path and libcontainer
Upstream-commit: 228c6a374bf5fa47b0e19751ddc9148052bb7bbc
Component: engine
 2014-07-24 17:22:21 -07: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
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