Commit Graph

425 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
9140b4810a Merge pull request #7151 from SvenDowideit/add-version-selection-ux
Add version selection ux to the Documentation.
Upstream-commit: 2f23e204d9190895ae761d97495fdbd7093b625a
Component: engine
2014-07-23 09:21:55 +10:00
5fa2981ff0 avoid publishing to the root unless specified, so old version releases only goto their own dir
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 4d109f6158c7607ee4cd9907b17ddba5f4d29d04
Component: engine
2014-07-22 19:05:18 +10:00
7bd6a5929b Add more details so I have more of an over-view of what I need to
automate

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 3472c006c4246977eb4fd8c9d55ab416eb5c3d50
Component: engine
2014-07-22 18:04:48 +10:00
71d1cc48f0 Reorganize and clarify the DOCKER_BUILDTAGS docs
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 1b31a80eb78789834b8a7d4daff583f0b9a938ed
Component: engine
2014-07-21 22:00:26 -06:00
a4488cce4c Merge pull request #7078 from unclejack/fix_archive_tar_pax_headers
archive/tar: update to fix writing of PAX headers
Upstream-commit: 1473374a2ad8566c85a00c3fd6f65f6c7ed5a766
Component: engine
2014-07-21 17:26:41 -07:00
5aa47fd32b Update libcontainer to cf45d141db69ce11dcccac178e5
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 1b9b11db4f43c8b55d48e0aae5e05155997fe314
Component: engine
2014-07-18 15:31:25 -07:00
1dfe01821b Merge pull request #7077 from tianon/fix-ubuntu-systemd
Fix hack/make/ubuntu to install both docker.service and docker.socket
Upstream-commit: 9870a2bcae6126689ad9cc865919a93837dd3b60
Component: engine
2014-07-18 14:13:04 -06:00
3ba66ad0ce Merge pull request #7069 from crosbymichael/update-libcontainer-july3
Update libcontainer to be85764f109c3f0f62cd2a5c8be
Upstream-commit: 1646e5d69ac4e7280050594995ef291c75a5c1f5
Component: engine
2014-07-18 22:34:22 +03:00
0d14ff1a94 Merge pull request #7072 from SvenDowideit/remove-infrastructure-dir
this info is out of date and forgotten
Upstream-commit: ae37f2b88f7d53b783974c28fef9cf9a478ef36c
Component: engine
2014-07-17 14:39:14 -04:00
21ff4631f1 archive/tar: update to fix writing of PAX headers
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: f565862abcceaf74c2266ba40f34c1b24c6f40c3
Component: engine
2014-07-17 08:54:26 +03:00
777bf1081f Fix hack/make/ubuntu to install both docker.service and docker.socket
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: ff08357c9be7fce37b4be2f08d85e801d07af2f0
Component: engine
2014-07-16 23:03:32 -06:00
17983a728d this info is out of date and forgotten
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: ade6d780d6222681e16b04ff1439240afc880a4f
Component: engine
2014-07-17 12:04:52 +10:00
35e71a0cd0 Tianon made a micro-image (sub one meg?) that we can use as a very fast to download 'yes, your docker can download and run an image' test
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 6ae07e24104af6eb245339dae3a878fb983d112e
Component: engine
2014-07-17 11:54:35 +10:00
2dd031c537 Update libcontainer to be85764f109c3f0f62cd2a5c8be
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 9fc6058aa110d5b59c5068a289b6e3a30fc86f72
Component: engine
2014-07-16 16:57:19 -07:00
b8d866ae4d Merge pull request #6885 from tianon/standard-curl-sSL
Upstream-commit: 781a47e3f37f952630d2bdf4936388aaf52f3707
Component: engine
2014-07-14 18:39:31 -07:00
182632c50d Update libcontainer dep to fb67bb80b4205bece36ff70
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 3b4a1c54d834a21a2b2a22b359495939db3b77f1
Component: engine
2014-07-14 12:30:19 -07:00
eb6f1ba58f Add Tibor Vass as maintainer
* hack/
* archive/
* integration/
* server/buildfile.go

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 1a99f36580fc814778170ae68f5ea53694aa5c12
Component: engine
2014-07-11 12:28:11 +00:00
710bedaf51 Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e1166861d28121b0e389c913de9d0f4faf8f33d8
Component: engine
2014-07-08 19:53:08 -06:00
789e6439eb add hotfix help
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 751c7e0f003e27d7c862ff91ca85f300bfcbf2cc
Component: engine
2014-07-08 23:25:26 +00:00
9638017be3 Merge pull request #6858 from timthelion/patch-6
We haven't required lxc and aufs for years now...
Upstream-commit: fbafa8038d9b56ed37e9846cec6bb956944793a6
Component: engine
2014-07-08 09:37:53 +10:00
9f5fa2a3c1 Merge pull request #6829 from unclejack/update_archive_tar
update vendored archive/tar to lower the number of memory allocations
Upstream-commit: e7db0d4f44b3a4cd9b34776bc936f42fa417f9ea
Component: engine
2014-07-07 23:35:19 +03:00
41890809ce We haven't required lxc and aufs for years now...
Well, maybe not years, but internet years...

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
Upstream-commit: ea583fda97617a349ef026dd2d99a0d5e4b0980d
Component: engine
2014-07-07 19:45:36 +00:00
e6a7274d4c Standardize "curl" arguments across the repo to be or include "-sSL"
- https://botbot.me/freenode/docker-dev/msg/17315692/
- https://botbot.me/freenode/docker-dev/msg/17315994/

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 9f61e233c6da72f692190f1f5eb672341253f3e7
Component: engine
2014-07-07 10:35:38 -06:00
03141b4b87 Fix DCO parsing for numeric github handles like cpuguy83
Turns out, "alphanumeric" actually means both "alpha" AND "numeric". Dur.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: bbbf64242726dee184f82b3bb355327c9c85b274
Component: engine
2014-07-07 09:57:50 -06:00
1107c3c89f Update the Travis GitHub username regex to match the GitHub username requirements
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e895817ad72c681b265bc647d18f201ceced90c5
Component: engine
2014-07-07 08:36:31 -06:00
ee3e18ed8e update vendored archive/tar to lower allocations
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: b885f61a61df1e8d8f71914e17c2a2861167f96e
Component: engine
2014-07-03 08:28:39 +03:00
28b9680123 Merge pull request #6819 from vieux/update_release_checklist_and_gitcommit
update release checklist and .gitignore
Upstream-commit: 65e4b57fda5b43ba2c1aa6db922b193b9b809600
Component: engine
2014-07-03 10:36:52 +10:00
c8806a50df I'm going to wish I didn't do this
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: fa29b1f062d25c1a8ca62f02b9cc7533df4c7449
Component: engine
2014-07-03 10:31:56 +10:00
aaeea8a0a5 update release checklist and .gitignore
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 170ba7f8feea9b284d20ed85e9ea9c947be2941c
Component: engine
2014-07-02 18:54:14 +00:00
684f8af215 Merge pull request #6748 from LK4D4/increase_max_patricia_prefix
Increase max patricia prefix
Upstream-commit: b0824edc7c93db4c2e880931a4041ca1188a2edd
Component: engine
2014-07-01 19:03:30 -04:00
953579a767 Update gorilla/context
Race condition was fixed recently
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: ea464ea212aa584dd0aa50820c78f7f60a77450d
Component: engine
2014-06-28 12:38:29 +04:00
7e94f694f2 Update go-patricia to v1.0.1
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 2edfb1e696d8f46ea4276b3952078b1553ea42eb
Component: engine
2014-06-28 12:20:31 +04:00
3aa7eb85d0 Merge pull request #6678 from mheon/fix_man_generate
Path fixes in md2man script and README
Upstream-commit: 74a34bb1fefbb9fd97562910a6cce7324f056be6
Component: engine
2014-06-27 14:29:36 -07:00
f1dd83f7f9 Update libcontainer to 53cfe0a1eba9145bf5329abbb52
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 41e75232914df5f5075d5d04cc2891fee9417067
Component: engine
2014-06-26 16:56:39 -07:00
1581226df4 Fixed manpage generation script and README
Update md2man script to generate manpages inside docs/man/ directory. Update
usage documentation in the readme to point to the new docs/man path. Update
Ubuntu makefile to use new path to manpages

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: fa3ac2d37032583a7c1171c24d71fbf93e330acc
Component: engine
2014-06-26 15:51:26 -04:00
55be9bc370 refactor TruncIndex to use a trie & vendor deps
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: e0dad305791a7406cf819a27fa5a079a46a62acc
Component: engine
2014-06-26 16:57:54 +03:00
909b3a8ba8 Merge pull request #6629 from SvenDowideit/move-man-pages-to-docs
move the man pages to the docs/ dir
Upstream-commit: 11ef08402a5b8d39b1ec3fe004aa1d4b4c0ca5b3
Component: engine
2014-06-25 07:50:09 +10:00
060053e75d Update libcontainer to 5210a236b92a8022a673108f347
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 423a8f91d72f5def754ec3a8efe000aa70bc6f22
Component: engine
2014-06-24 11:30:36 -07:00
b873d0d1bc move the man pages to the docs/ dir
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 42be6f2957c945e070079ec773e29b356a9f9452
Component: engine
2014-06-24 13:07:42 +10:00