a0d04e4cbb
Replace old index image with hub
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: ba57d3d9e63445f43e4d53da44e8dec27baa288d
Component: engine
2014-07-30 11:15:18 -04:00
362bc99b19
Merge pull request #7215 from tiborvass/add-os-to-docker-info
...
Add OS to docker info
Upstream-commit: c18b38f912d08105177630718a78562186ae7324
Component: engine
2014-07-30 18:02:45 +03:00
ca4826fd77
Add OS to docker info
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: b0fb0055d279bc25aa2f91c112929ea8eb92c1db
Component: engine
2014-07-30 10:37:52 -04:00
fdbe4305c1
Merge pull request #7286 from erikh/parsers
...
Move parsing functions to parsers/ and the specific kernel handling...
Upstream-commit: 403df1765abfd3ac62b7f6b8bd709fb0d691d8c8
Component: engine
2014-07-29 16:11:31 -04:00
e25f77248d
Move parsing functions to pkg/parsers and the specific kernel handling
...
functions to pkg/parsers/kernel, and parsing filters to
pkg/parsers/filter. Adjust imports and package references.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 4398108433121ce2ac9942e607da20fa1680871a
Component: engine
2014-07-29 13:09:10 -07:00
8545bf6daa
Merge pull request #7311 from tianon/travis-old-go
...
Add Go 1.2 to Travis so we make sure we keep retrocompat for a little while
Upstream-commit: 335e82f3f7abfcf783bead6e38b7a3aefe0c768a
Component: engine
2014-07-29 13:48:24 -06:00
887f270676
Merge pull request #7292 from erikh/buildfile_move
...
server/buildfile.go -> builder/builder.go
Upstream-commit: 1063b438eb149ddc9b899c38a06cc1e666d512bf
Component: engine
2014-07-29 15:38:42 -04:00
b812e976e3
Merge pull request #7272 from unclejack/create_httputils_pkg
...
move resumablerequestreader to pkg/httputils
Upstream-commit: 3bae02cbe32b856107a5d61c496f35d69c35aa2d
Component: engine
2014-07-29 12:18:10 -07:00
981a6f43de
Add Go 1.2 to Travis so we make sure we keep retrocompat for a little while
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 38bce179040c80512c39c42ebbf776e58ac3dfcf
Component: engine
2014-07-29 13:07:59 -06:00
17543b1068
server/buildfile.go -> builder/builder.go; add maintainers file
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 3a177ccd3afdfe481a7248fccb2efe0f2cbdfcca
Component: engine
2014-07-29 11:35:02 -07:00
d0658f2e0a
Merge pull request #6877 from underscorephil/patch-1
...
Update softlayer.md
Upstream-commit: 475131cd4a5ef8178e36bf40721baf14ce2b6e26
Component: engine
2014-07-29 13:20:55 -04:00
8323f096b4
Merge pull request #7256 from jstoja/docs-api-insert-image
...
Fixing docs - Insert api call
Upstream-commit: 4749b884fe162edbd303fe6cc23223a7be9b9226
Component: engine
2014-07-29 13:19:22 -04:00
e9f01897da
Merge pull request #7269 from r0n22/patch-1
...
Update HTTP Proxy Section
Upstream-commit: 900d54b48b3091f9bd03f254d5ac9e458bdd53d9
Component: engine
2014-07-29 13:15:27 -04:00
b7f9603931
move resumablerequestreader to pkg
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: c0517857f64d1148d02809e3ba3dd39bf8322ed3
Component: engine
2014-07-29 16:30:45 +03:00
c30e5bea2d
Merge pull request #7280 from knappe/patch-1
...
Correct Typo In Documentation
Upstream-commit: 3369b4f6f03f400d7c6d3dbf1a86401d983503be
Component: engine
2014-07-29 19:15:48 +10:00
c827ecda15
Merge pull request #7062 from crosbymichael/fix-lxc-caps
...
Fix cap drop issues with lxc
Upstream-commit: ac3eecf3db5f81a553b71267f2e18ca7b7d95fea
Component: engine
2014-07-28 16:19:08 -07:00
bed02719c0
Correct Typo In Documentation
...
Upstream-commit: 331200cbaae75a2876bac037c8df2e609bab9658
Component: engine
2014-07-28 14:39:17 -06:00
80ac009e50
Merge pull request #7274 from vbatts/vbatts-gh7136
...
progress bar: don't strings.Repeat a negative number
Upstream-commit: a0dad3dfb22a5d09d01bb886caece26950d17b61
Component: engine
2014-07-28 11:50:16 -07:00
2a6df8d538
Merge pull request #7210 from fcarriedo/refactor-common-code
...
pkg/units: Refactor common code
Upstream-commit: f906f31877f63a7f9fab954157667e0f341210ba
Component: engine
2014-07-28 11:45:46 -07:00
b178420296
jsonmessage: added test and cleaned up others
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 704b97d1c4cc6eaa6ecf9630eed2dffd5abaffb9
Component: engine
2014-07-28 14:43:28 -04: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
ddd05d0cc1
progress bar: don't strings.Repeat a negative number
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 77237be0e23dfaba4d4d97a525c3ecc7fb819042
Component: engine
2014-07-28 12:01:43 -04: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
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
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
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
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
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
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
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