8d2d67cdd2
Optionalize the "hg clone" of Go, since it takes forever (now, to update our Go version too, we need to explicitly "./hack/vendor.sh --go")
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Upstream-commit: 78c68825671eb1bd102d76d671ace9de5a37aa19
Component: engine
2014-08-20 14:17:11 -06:00
065feffb73
Update libcontainer to db65c35051d05f3fb218a0e84a1
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 624b944896d47031f9df166b4275037664a3cb23
Component: engine
2014-08-20 11:19:55 -07:00
693c6c8fed
Update libcontainer to 29363e2d2d7b8f62a5f353be333
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: a67d06fd4343024ed25c3faf40e58c9a1935c28a
Component: engine
2014-08-15 15:41:05 -07:00
defddfab5d
Add Cristian to hack/MAINTAINERS
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: 7d1b2ebde8a0d1484f486b5ea01b1a77014b958b
Component: engine
2014-08-13 08:13:51 +00:00
f82c0c847e
Merge pull request #7359 from timthelion/patch-10
...
Add process for PR acceptance, review, rejection
Upstream-commit: 3de3719290d63e1827ad61c84256e5cc219dea91
Component: engine
2014-08-12 19:17:10 -04:00
db1cb3039c
Add process for PR acceptance, review, rejection
...
This is an extremely tentative PR. However, I feel that the suggestions are generally good.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: timthelion)
Upstream-commit: e4a09cd79d0ee3fbb6a33552a21c53491d9f3953
Component: engine
2014-08-12 20:29:45 +00:00
d487159628
Update libcontainer to f2e78425c377acc7a67a35c3148
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: c74e8b544defeca8fb215a2295066e10f91bedda
Component: engine
2014-08-08 16:12:35 -07:00
a73db3dc5c
Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Upstream-commit: 5101173e1fa5616768cb7a1b07f6c911f0f63658
Component: engine
2014-08-06 13:18:24 -06:00
17e78a7923
Update libcontainer to 5589d4d879f1d7e31967a927d3e
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 6215422286f59530e598b3317c9ea789f8c1d0c7
Component: engine
2014-08-05 18:13:43 -07:00
28202b64df
Merge pull request #7377 from tianon/daemon-build-tag
...
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
Upstream-commit: 3c1212ca3009dd5e8c89bfe6ab5bf42756c05da9
Component: engine
2014-08-04 17:32:03 -07:00
02a1f76d0b
Merge pull request #7310 from stevecrozz/maintainers-grammar-update
...
Correct grammar in MAINTAINERS.md
Upstream-commit: 6b94f2d9bece828f8959a51b34135f38c6ce5cc9
Component: engine
2014-08-04 17:57:08 -06:00
587342c3a2
Adjust build tags to be client-only in "make cross" too
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: ba663eac3a2deba4d89803453b07a09d8628f5f9
Component: engine
2014-08-04 15:05:12 -06:00
309f9edb73
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
...
This works mostly by refactoring our "main" package to be careful about what it imports based on the daemon build tag. :)
Also, I've updated Travis to test "client-only" compilation after it tests the daemon version.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 1b95590d06b20b79041f6d23b9bc35612b82cb51
Component: engine
2014-08-04 15:05:12 -06:00
e31ec5d7f0
Correct grammer in MAINTAINERS.md
...
Signed-off-by: Stephen Crosby <stevecrozz@gmail.com >
Upstream-commit: 74212a15658a3f1c68a381a593488d7fda830272
Component: engine
2014-08-04 13:37:01 -07:00
3026860f67
Update libcontainer to 68ea1234a0b046803aacb2562df
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 22f373aeda63cffb06efca4fae067395191e02e9
Component: engine
2014-08-04 12:34:11 -07:00
e68d8fa768
Accept vanilla Linux Foundation signoffs
...
This allows signing off commits with `git commit -s`
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Cleaned up DCO regex
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 4909a702045e621f236f5ec5470c8a9ec7fd7022
Component: engine
2014-08-01 19:30:34 -04:00
bcbc563aab
Btrfs graph driver is not experimental
...
Btrfs graph driver is not experimental now according to #4838 and CHANGELOG.md is saying "btrfs is no longer considered experimental.".
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com > (github: ichik1)
Upstream-commit: 58588009c00d1c7dd279b95d33759f61499c2848
Component: engine
2014-08-01 14:37:38 +09:00
c5e8598f0d
Merge pull request #7035 from tianon/standardize-apt-get-install
...
Standardize "apt-get install" usage across the repo
Upstream-commit: 503d124677f5a0221e1bf8c8ed7320a15c5e01db
Component: engine
2014-08-01 11:43:37 +10:00
4796299987
Bump libcontainer dep
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: f4db3985d9b6ce481437c9524bb33640d602a2cb
Component: engine
2014-07-31 12:46:35 -06:00
4d9e0d4b74
Fix more instances of "dotcloud/docker" in hack/ (and add a DOCKER_PKG environment variable to simplify references to our "package path" in our bundlescripts)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 3a14eb066cef537e52f96c6ad76adab2efe02e05
Component: engine
2014-07-30 17:02:04 -06:00
e2390724e7
Standardize "apt-get install" usage across the repo
...
I might have missed some, but I think this is most of the offenders.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: fc637b5275c2fe23c9857a34316a783042d906b8
Component: engine
2014-07-28 17:41:59 -06: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
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