Commit Graph

410 Commits

Author SHA1 Message Date
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
8a5bd0e9d1 Merge pull request #6553 from tianon/disable-netgo-for-dynbinary
Disable netgo for dynbinary builds
Upstream-commit: 506ad22743a233b168fb0053e39e9c5dd1ec92ce
Component: engine
2014-06-20 17:51:12 -06:00
beca1cc741 Update libcontainer dep to v1.0.1
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 8d06bfc12ec62b8276b2db22e049d40dde016c9f
Component: engine
2014-06-19 15:23:19 -07:00
d1de6bfa90 Fix dyntest and rename it to dyntest-unit to match the test-unit rename
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 986a151b8afe59b33097235a5964f78fc1a55521
Component: engine
2014-06-19 15:06:34 -06:00
d81f6470d4 Disable netgo for dynbinary builds
It's not necessary to use the netgo implementation for non-static builds. :)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3f7909e9967ded9740fdf951c6f7e95f4aa9c963
Component: engine
2014-06-19 14:35:30 -06:00
dec7c25a51 Merge pull request #6244 from tiborvass/fix_release_checklist
Fix documentation for release-checklist
Upstream-commit: 443d923f08bfcd4c9cc0115bd84861980e23355a
Component: engine
2014-06-18 13:52:51 -07:00
45850ea1bb Fix documentation for release-checklist
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 586e72218ceeb90d31900af198d5c865e4b3e6e4
Component: engine
2014-06-18 16:45:15 -04:00
14681fef9b use a numbered list for maintainers responsibility
At the moment maintainers responsibility are spelled out with a hybrid
list. I.e. an unordered list with an associated number.

In this commit I the number list proper is used.

Docker-DCO-1.1-Signed-off-by: Daan van Berkel <daan.v.berkel.1980@email.com> (github: dvberkel)
Upstream-commit: cc96d312526dac5eff3e0521b921e08301715ce5
Component: engine
2014-06-18 14:31:26 +02:00
e3f7ac181c Update libcontainer dependency to 77ffd49dfedbc78a
Fixes #6256
Fixes #6383
Fixes #6414

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 698ded75b9aa076f4278398e56fa95e90e900d2b
Component: engine
2014-06-17 13:09:36 -07:00
f612478eca Remove "production ready" from the roadmap
It's done as of v1.0.0.

Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Upstream-commit: 784a008346e9d0e3829bd08b6fc07cdcfc09bd82
Component: engine
2014-06-12 14:21:20 +01:00
6c66f51853 Use libcontainer version tag for vendor script
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d1757c005f05c76b31615d1d4d27722faee8012e
Component: engine
2014-06-10 20:23:05 -07:00
b8d91613b1 Remove and vendor libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8a8b6d79649f666dd00f2efd60f773bb3eed898d
Component: engine
2014-06-10 19:49:57 -07:00
4a0a27b9ff Don't compile nsinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 3986bc659be9ff83d521f82e3353b1f73b896cbc
Component: engine
2014-06-05 17:03:32 -07:00
1dae3a407b Add documentation build steps for the next release manager to follow.
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 953abf6ae7b31a3563fa57a9898305018add0571
Component: engine
2014-06-01 08:31:33 +10:00
62daf025f0 updated documentation for mentioning images vs containers
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl> (github: fruitl00p)

rebased by

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: a0505edc9a890b3d4cdf5cf1850273c250c3dc41
Component: engine
2014-05-29 11:20:41 +10:00
fe98fe4b11 vendor: bump github.com/coreos/go-systemd to v2
There are a couple of bugfixes since this was last bumped. Pull them in.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: df5585b273686324e9fd8269a6492409698623ee
Component: engine
2014-05-21 15:31:04 -07:00