2deb48fe38
Fix cross compile
...
stat.Rdev and time.* is 32bit on OSX, which breaks cross builds with eg:
cannot use stat.Rdev (type int32) as type uint64 in function argument
We fix this with an extra conversion to uint64.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: ba52130873395a44d637fc57f98ed174f0ac87bb
Component: engine
2014-01-17 11:01:28 +01:00
692720d854
Don't shell out to tar for ExportChanges
...
This changes ExportChanges to use the go tar support so we can
directly create tar layer files. This has several advantages:
* We don't have to create the whiteout files on disk to get them
added to the layer
* We can later guarantee specific features (such as xattrs) being
supported by the tar implementation.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: d54ce8087aba23663856c81a3fb5475979bdf453
Component: engine
2014-01-13 13:36:11 +01:00
e7a98d831f
Merge pull request #3554 from tianon/ubuntu-dep
...
Add ca-certificates to our package Recommends
Upstream-commit: 07f62f199fa81e9645114589ecaeb888a6084649
Component: engine
2014-01-11 15:07:50 -08:00
bc406dc2fc
Merge pull request #3551 from tianon/test-docker-io-gpg-fingerprint
...
Inline the test.docker.io fingerprint in the install.sh script as well
Upstream-commit: 7273b33e861554315f74e2d4b612f7b6d2c11a3f
Component: engine
2014-01-11 15:07:06 -08:00
5de703576d
Merge pull request #3539 from jeandalido/patch-1
...
Update docker_remote_api_v1.8.rst
Upstream-commit: ba90fcfc08128d50ece8fd946b65a05b0cc7293c
Component: engine
2014-01-11 13:29:56 -08:00
283c7cd8b1
Merge pull request #3500 from tianon/lvm2-version
...
Add more specific lvm2 version to PACKAGERS document
Upstream-commit: f65706aaeba84efa3056f8f349154b2ae31e9132
Component: engine
2014-01-11 03:39:01 -08:00
dcbe7663ea
Merge pull request #3555 from jordansissel/patch-1
...
Update Ubuntu packaging script to use 'fpm -s empty' instead of 'mkdir empty && fpm -s dir -C empty'
Upstream-commit: cb314b9752352d9034466c3503058f22b79c345f
Component: engine
2014-01-10 22:46:30 -08:00
6403af89bd
Use '-s empty' instead of '-s dir'
...
This *should* have the same effect as the previous strategy: Instead of
'mkdir empty; fpm -s dir -C empty ...' we can simply do 'fpm -s empty'
Docker-DCO-1.1-Signed-off-by: Jordan Sissel <jls@semicomplete.com > (github: jordansissel)
Upstream-commit: a02450d048d0a858aceda2343ef4d7633eca6ebb
Component: engine
2014-01-10 22:36:58 -08:00
a15c21f17d
Merge pull request #3490 from vieux/image_export_job
...
Move image_export to a job
Upstream-commit: b61570b521346769908e678e96e510e6ae193f28
Component: engine
2014-01-10 15:58:47 -08:00
06453f28d3
Move image_export to a job
...
Docker-DCO-1.0-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5264914e574c20c8fefcd6e5d858f51f341dd9da
Component: engine
2014-01-10 15:54:44 -08:00
d1d0fdf0a6
Merge pull request #3180 from vieux/job_container_delete
...
Move container_delete to job
Upstream-commit: 6dde20c0c517833224689c0eff2d247910a7083b
Component: engine
2014-01-10 15:53:38 -08:00
bf5f5a9318
Merge pull request #3476 from vieux/restart_job
...
Move restart to a job
Upstream-commit: ad162b75a06a796d404a3e6d8fb728f0788dc399
Component: engine
2014-01-10 15:52:42 -08:00
aee266dfbc
Move restart to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 15689b56c8e397d3207dad5b23937cb9b1e453cd
Component: engine
2014-01-10 15:51:48 -08:00
cf41511c88
move container_delete to job
...
handle error
remove useless errStr
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com > (github: vieux)
Upstream-commit: aa3339cf39b88e4a4b3d830d9b0831d4abff1dcb
Component: engine
2014-01-10 15:34:10 -08:00
8e55abfd24
Merge pull request #3543 from EvanKrall/gzip_debs
...
Use gzip compression in Ubuntu packages to make it possible to install on Lucid
Upstream-commit: 459e0aa2c18724157355f051a6b4c57978d13a16
Component: engine
2014-01-10 15:29:22 -08:00
5a61d77c34
Add ca-certificates to our package Recommends
...
It's only in "Recommends" because it's only required for all but the esoteric configurations (since you can't "docker pull" from the index without it, but that's about it).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: e5189b5dd2c044030e7e2ab7029eba0fe91c3b25
Component: engine
2014-01-10 13:06:53 -07:00
17e2946fdd
Use gzip compression in Ubuntu packages to make it at least possible to install on Lucid.
...
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com > (github: EvanKrall)
Upstream-commit: c2a59dfe48e55bc93e3bed5ecde021f372151b09
Component: engine
2014-01-10 11:45:00 -08:00
ee61e0d71c
Inline the test.docker.io fingerprint in the install.sh script as well
...
As long as we're doing it, we ought to do it for all the "official" Docker properties at least
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 051e7a0befaddb6ddbd047abff5f524a7247af6c
Component: engine
2014-01-10 10:20:31 -07:00
37eaecc842
Update docker_remote_api_v1.7.rst and non-versionned
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Dalido <jbdalido@gmail.com > (github: jeandalido)
Upstream-commit: 2fd4c39c86a87660cedae19936d5fc5164edd859
Component: engine
2014-01-10 11:35:25 +01:00
59bc509d7d
Update docker_remote_api_v1.8.rst
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Dalido <jbdalido@gmail.com > (github: jeandalido)
Upstream-commit: d69cf2986eb864ffcad026bfbdd30beda5061175
Component: engine
2014-01-10 11:27:21 +01:00
73f11d30c2
Merge pull request #3537 from crosbymichael/merge_release_v0.7.5
...
Merge release v0.7.5
Upstream-commit: 7985125602e8ddf79b5ac0ef56c71ac8962455ac
Component: engine
2014-01-09 11:39:35 -08:00
3e5c7bd070
Change version to v0.7.5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c3c89abfd65cb3d0d8c7796b035dde314fb9a2c3
Component: engine
2014-01-09 11:36:30 -08:00
fe59f70554
Merge branch 'release' into merge_release_v0.7.5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1fcbd36cb2780175082a880f0ce85d91ecb81c87
Component: engine
2014-01-09 11:36:14 -08:00
1b47d0f1c6
Merge pull request #3532 from crosbymichael/bump_v0.7.5
...
Bump to v0.7.5
Upstream-commit: 845b8166869ba320c1e753ed8ca560bbf9453767
Component: engine
2014-01-09 11:33:57 -08:00
2cdaea3fbb
Merge pull request #3533 from crosbymichael/run-rm-remove-volumes
...
Remove volumes on docker run -rm
Upstream-commit: fc14e81bf945afe192b7e31991900fe27f991e3b
Component: engine
2014-01-09 10:47:28 -08:00
eed6e32053
Bump to version v0.7.5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c348c04fdfb00e013be9db15d37728e04fb94b76
Component: engine
2014-01-09 10:34:50 -08:00
ceb42fa9b3
Merge pull request #3535 from plietar/3457-git-build
...
Don't compress the archive made from git's output.
Upstream-commit: 5ca0fedffc6d4498364cf42a3812b85591fb86d9
Component: engine
2014-01-09 10:32:28 -08:00
694098392a
Don't compress the archive made from git's output.
...
Commit 894d4a23fba made BuildFile use TarSum, which doesn't support
compressed tar archives.
This breaks builds from git url, which compressed it with bzip2.
Instead, just pass it uncompressed.
Docker-DCO-1.0-Signed-off-by: Paul Lietar <paul@lietar.net > (github: plietar)
Upstream-commit: 562a23576328c1586f1be968fa15cb075267138c
Component: engine
2014-01-09 18:23:19 +00:00
512d7502bb
Remove volumes on docker run -rm
...
If we don't care about the container then we don't care about any
volumes created with the run of that container
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 14acf6883db8069a10a727ed26f7ef801f460353
Component: engine
2014-01-09 09:58:40 -08:00
4765401e7e
Merge pull request #3530 from creack/update_dco_doc
...
Update DCO git hook example
Upstream-commit: eb131250aa7680812f8f7669b8fdfaaf7dbe8431
Component: engine
2014-01-09 09:23:35 -08:00
ea32b7c1af
Merge pull request #3528 from tianon/update-travis-dco
...
Update Travis to check for new 1.1 DCO version
Upstream-commit: 9ec29fddf8d27b9770e9e379b2aac44f025ec36f
Component: engine
2014-01-09 09:23:23 -08:00
19b256d8cc
Merge pull request #3527 from keeb/add-dco
...
Amend DCO
Upstream-commit: d015d31b1ca7dcd1952c252d479a3ba84ad4c5b5
Component: engine
2014-01-09 09:23:11 -08:00
0f761b4227
Merge pull request #3522 from bantic/fix-misspelled-names
...
Fix misspelled Hawkings -> Hawking, Archimede -> Archimedes, Euclide -> Euclid
Upstream-commit: f6292ab8d0e8b0181cd1ef0df2a61f3d0e9283ec
Component: engine
2014-01-09 09:12:05 -08:00
f362f40f54
Update DCO git hook example
...
Upstream-commit: c3f259754688d7c20cac5b8f8b998a7608f034a8
Component: engine
2014-01-09 09:02:56 -08:00
398a309d63
Update Travis to check for new 1.1 DCO version
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: a4f3cd62a3d221dcb55279cc9f0db41e7920c094
Component: engine
2014-01-09 09:52:17 -07:00
35730d58c5
Bump DCO version
...
Upstream-commit: 11d61ec77feb743a3eedef7d85a7a751ed09736e
Component: engine
2014-01-09 08:47:03 -08:00
c876780684
Fix layout
...
Upstream-commit: 40c90796e950307804745c5a852cc64d3e53a1a9
Component: engine
2014-01-09 08:35:47 -08:00
3bde09b0e2
Removed the 5th clause
...
Removed clause which states contributions should be relicensed
Upstream-commit: 7fb55f77250a9b52b0515a7e655ecc605ae452ca
Component: engine
2014-01-09 08:35:06 -08:00
c89473f354
Fix misspelled Hawkings -> Hawking, Archimede -> Archimedes, Euclide -> Euclid
...
Docker-DCO-1.0-Signed-off-by: Cory Forsyth <cory.forsyth@gmail.com > (github: bantic)
Upstream-commit: 7a7c3d87d8040b41970b7fc89305bb18561386d3
Component: engine
2014-01-09 10:02:55 -05:00
bb8a02af09
Merge pull request #3515 from crosbymichael/no-host-name-without-networking
...
Do not add hostname when networking is disabled
Upstream-commit: 42df36b6fcbf2397a35d37a59fbb50d69e27129e
Component: engine
2014-01-08 17:22:24 -08:00
a7ff45c891
Do not add hostname when networking is disabled
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0354c3a95cf1f95ac9564b8e2897295e8a8613fd
Component: engine
2014-01-08 16:57:56 -08:00
0c23a3189c
Merge pull request #3511 from bantic/fix-misspelled-feynman
...
Fix misspelling of Richard Feynman's last name
Upstream-commit: 189c40597fb7453ab7d37b4d3c2e08116c3b676c
Component: engine
2014-01-08 16:29:59 -08:00
ba0bbf8655
Fix misspelling of Richard Feynman's last name
...
Docker-DCO-1.0-Signed-off-by: Cory Forsyth <cory.forsyth@gmail.com > (github: bantic)
Upstream-commit: 98193a397ef933a449f70c7661bff037bf98eb99
Component: engine
2014-01-08 19:02:15 -05:00
5f6e6869ed
Merge pull request #3460 from tsaavik/patch-1
...
Fixed error in group add example
Upstream-commit: c45cd9174ebc0c7dbc9f245166152ffd35cc72f4
Component: engine
2014-01-08 15:45:23 -08:00
91a5b68120
Merge pull request #3446 from tianon/update-checklist
...
Update release checklist with more information, more commands, and more ...
Upstream-commit: ee656336205859cd3a935c00a02e47ef18d442cc
Component: engine
2014-01-08 15:37:49 -08:00
16a6c2302b
Merge pull request #3417 from Sjord/use-most-recent-cache-image
...
Fix issue #3375 - Return most recent image from the cache
Upstream-commit: 3be2ea021d27b26d84767c9d05a6d3480e771d9d
Component: engine
2014-01-08 15:30:36 -08:00
b1d3493775
Merge pull request #3464 from vieux/fix_error_wait
...
fix error on docker wait
Upstream-commit: 1d0d093d0b24ab3119a3b727f3c6aeffcf82a9bf
Component: engine
2014-01-08 15:06:54 -08:00
f6c668dbf1
Merge pull request #3493 from SvenDowideit/commit-signoff-location
...
give more specific advice on setting up signing
Upstream-commit: 38a49951b3fba85b41e6a328fec7fa4b33c2f6d8
Component: engine
2014-01-08 15:04:00 -08:00
454544f252
Merge pull request #3510 from creack/hotfix-add_caching
...
Hotfix add caching
Upstream-commit: 772765c404e13e3b7225ab1c3263aa208404b44e
Component: engine
2014-01-08 15:00:18 -08:00
e460c649ec
Merge pull request #3514 from vieux/update_REMOTE_TODO
...
update REMOTE_TODO.md
Upstream-commit: 71e89fdc75ec5e108c990614f49558cef5195c41
Component: engine
2014-01-08 14:51:35 -08:00
