Commit Graph

8940 Commits

Author SHA1 Message Date
c62c248793 Update nodejs_web_app.md
Updated to documentation to use the centos6 image instead of the unofficial tutum image of centos6.4
Upstream-commit: bfacdfdccf5e93301842309a0048990ef0ebb549
Component: engine
2014-07-31 08:54:22 +02:00
65df9ecf1a Update nodejs_web_app.md
The image centos:centos6.4 doesn't exist. Instead you have to choose between the official centos6 or centos7. Both images does not work together with de yum npm install. When choosing an centos6.5 from another distributor (tutum) it works.
Upstream-commit: 2519872d77da8cb6a9c5f55e44cfaeb9cd603978
Component: engine
2014-07-28 20:43:24 +02:00
ec6e0ee58c Merge pull request #6943 from tiborvass/parallel_compile_test
Parallel compile test binaries
Upstream-commit: 5ef1126669ee6fac50679e4d65d1eb822a59fbec
Component: engine
2014-07-28 12:32:56 -06:00
63538328fe Merge pull request #6520 from unclejack/bump_go_to_1.3
bump Go to 1.3
Upstream-commit: d09e682c46befb37a3dd47375b885d91c437c1f2
Component: engine
2014-07-28 11:06:43 -07:00
9833b2f84a Merge pull request #7257 from seblu/master
Improve systemd units
Upstream-commit: 380153f0d7e2c3a285ebf2f43306d99aa6c8dd9a
Component: engine
2014-07-28 11:51:19 -06:00
93d0b8352d Merge pull request #7140 from proppy/more-addtar-tests
integration-cli: add more tests for BuildAddTar
Upstream-commit: 030676444ade28ded0953ff179d65fe99bbf4fed
Component: engine
2014-07-28 11:58:29 -04:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
154cd33cd7 Typo in dockervolumes.md line 141?
Upstream-commit: 9503afbc9116b06585cf42715a7ae0bcd0fb7881
Component: engine
2014-07-25 09:06:38 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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