70ceedcf64
Fix for #3345 : Add Content-Type Header "application/json" to GET /version and /info responses in remote API
...
Docker-DCO-1.0-Signed-off-by: Manuel Woelker <github@manuel.woelker.org > (github: manuel-woelker)
Upstream-commit: 53a01aebd61e8db34c9106f5b2c5fdad6909caee
Component: engine
2014-01-08 09:17:20 +01:00
60f0fc80fb
Merge pull request #3496 from creack/disable_build_compression
...
Disable compression for build. More space usage but much faster upload
Upstream-commit: 322a42b8a2ec70721d3db72cc15342e63187aad9
Component: engine
2014-01-07 18:57:18 -08:00
de2942d9ec
Merge pull request #3498 from crosbymichael/merge_release_v0.7.4
...
Merge release v0.7.4
Upstream-commit: 90ea81433f7bfb5e9a21099b7238d439121b833e
Component: engine
2014-01-07 18:44:03 -08:00
5941fa4f74
Change version to v0.7.4-dev
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d7f26c93d9f813317e88fb6565c6eb0ca835a480
Component: engine
2014-01-07 18:41:06 -08:00
9ab21a4f21
Merge branch 'release' into merege_release_v0.7.4
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d4e61b48eb277828c4a87aee15c141d94149c799
Component: engine
2014-01-07 18:40:54 -08:00
17e9610fb2
Merge pull request #3495 from crosbymichael/bump_v0.7.4
...
Bump v0.7.4
Upstream-commit: 1a6fc02348fbcb44324a8a79d178c54e07ca24ea
Component: engine
2014-01-07 18:35:44 -08:00
a3c8233eb9
Bump to v0.7.4
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 010d74ec2f3dfefea5cafa602bce5cdeac3a0c19
Component: engine
2014-01-07 18:06:20 -08:00
7dedb038c3
Disable compression for build. More space usage but much faster upload
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 1137ecf7d1301e7f743978e02d874093bd68dacb
Component: engine
2014-01-07 17:46:04 -08:00
1604296c8d
Merge pull request #3361 from zimbatm/gpg-key-secure-best
...
Makes sure the GPG fingerprint is inlined in the doc everywhere.
Upstream-commit: a25a80b2d37bd990062363adaef7afdd3f8751f8
Component: engine
2014-01-07 17:43:04 -08:00
6560fa5daf
Merge pull request #3474 from creack/fix_add_cache_issue
...
Fix ADD caching issue with . prefixed path
Upstream-commit: bb76985d39112fc07e64334704702a90d0bea8f1
Component: engine
2014-01-07 17:24:18 -08:00
856026fd4d
Merge pull request #3492 from unclejack/3449-fix_docker_build_on_devicemapper
...
#3449 - fix `docker build` on devicemapper
Upstream-commit: 28ec47c44163f1d51b47e76a83d661e5d37b81f6
Component: engine
2014-01-07 17:12:31 -08:00
7f69f81268
Fixes key installation for other target urls in hack/install.sh
...
Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com > (github: zimbatm)
Upstream-commit: 94c803e9f0e725e6a52f71ffaa88d05137b62771
Component: engine
2014-01-08 01:08:14 +00:00
b057d9da45
Makes sure the GPG key fingerprint is inlined in the doc everywhere.
...
Instead of `curl $url | apt-get add -` use the ubuntu keyserver and a full
fingerprint to retreive the key. This makes the distribution of the GPG key
more secure an less likely to change even if 3rd party gains access to the
packages repository.
Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com > (github: zimbatm)
Upstream-commit: 13ebc68636f922e799d71792748934b8883d2f1f
Component: engine
2014-01-08 01:07:04 +00:00
d253920583
Revert "Add -S option to tar for efficient sparse file handling"
...
This reverts commit 733bf5d3ddbfb6dba7c2c0996c4af47a765e4593.
This is needed to fix "no such file" errors `docker build` errors for
devicemapper.
This fixes issue #3449 .
Docker-DCO-1.0-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: d003cfea25c276904dbe1e972c0cf71d5c25e689
Component: engine
2014-01-08 02:58:39 +02:00
b0481e14ce
Fix issue with file caching + prevent wrong cache hit
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: f3103e5c9157aed2a5ab0f4c70e328cd0aa69b59
Component: engine
2014-01-07 16:53:55 -08:00
0cf00ffca6
Make vfs error more explicit
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: ef7e000a13eed5ebf761ab4ca83fa8f727170aa5
Component: engine
2014-01-07 16:02:41 -08:00
45fc411688
Fix ADD caching issue with . prefixed path
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <charmes.guillaume@gmail.com > (github: creack)
Upstream-commit: 811341423bd9d3d65640cb4aa04d2840817182ca
Component: engine
2014-01-07 16:02:20 -08:00
ec9c950a6c
Merge pull request #3430 from lsm5/fedora-official-image
...
install instructions use unprefixed fedora image
Upstream-commit: b3addb5fb8814c0e76e2115404caef8a4efb393c
Component: engine
2014-01-07 15:12:37 -08:00
5b404255d5
Merge pull request #3483 from lukaspustina/patch-1
...
Missing redirect in line 85
Upstream-commit: 00ee6d1925688bda77d5055d7e4be1cbd8b64a07
Component: engine
2014-01-07 15:11:02 -08:00
dffdf1a269
Merge pull request #3462 from tsaavik/patch-2
...
Simplified and streamlined Amazon Quickstart
Upstream-commit: 6f8a79c23c7ae80a18fb291c7dd65e12b8a6c037
Component: engine
2014-01-07 15:09:35 -08:00
fc2f70defb
Merge pull request #3461 from jbeda/patch-1
...
Update instructions for mtu flag for Docker on GCE
Upstream-commit: cf8063d1521e7e065e859b3e2f58e52d3b54a0f7
Component: engine
2014-01-07 15:03:19 -08:00
2cdbf533f4
Merge pull request #3488 from jamtur01/1310
...
Fixed #3481 - Added Ubuntu Saucy to installation
Upstream-commit: 3e10fe1a156b822e9daea5623411c187b2f5e2a1
Component: engine
2014-01-07 14:56:03 -08:00
f676391bcd
Merge pull request #3487 from crosbymichael/improve-images-speed
...
Only get rootfs when we need to calculate the image size
Upstream-commit: 45ecdf9c8e468bb93a96665fe92e526dabf2ee43
Component: engine
2014-01-07 14:47:31 -08:00
0055a569e4
Merge pull request #3491 from tianon/travis-numeric-commit
...
Fix Travis handling of a fully-numeric commit hash being YAML-converted ...
Upstream-commit: b942f24ba888ee7b9d579955e50b11d98d636f4f
Component: engine
2014-01-07 14:35:06 -08:00
01b84e7dd9
Fix Travis handling of a fully-numeric commit hash being YAML-converted to a number instead of a string
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 3779291e9b2f939aa98b91b35552bd9b76c9f39a
Component: engine
2014-01-07 15:27:51 -07:00
914d9d5f46
Only get rootfs when we need to calculate the image size
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <crosby.michael@gmail.com > (github: crosbymichael)
Upstream-commit: fa14a1b9835a46bc9c48c1385b514a0f8d0b4eac
Component: engine
2014-01-07 13:56:26 -08:00
a9154e9ad5
Merge pull request #3489 from tianon/travis-fixes
...
Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master"
Upstream-commit: f9e14cc83884e246478c315964a2fcae03d5e8a8
Component: engine
2014-01-07 12:53:19 -08:00
7bb76fbc89
Update REMOTE_TODO.md
...
Upstream-commit: f2ea539467e34ef06455a3e0561bac1f5a482822
Component: engine
2014-01-07 12:51:17 -08:00
c43b1c60c8
Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master", and to also ignore commits with no content (like a Merge commit - there's no need to sign off on literally nothing)
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 7c4e5fbd4608bb4b1509552fbe9d3c0bcd7c347a
Component: engine
2014-01-07 13:45:40 -07:00
5b993f0514
Fixed #3481 - Added Ubuntu Saucy to installation
...
Docker-DCO-1.0-Signed-off-by: James Turnbull <james@lovedthanlost.net > jamtur01
Upstream-commit: 97ef8a067c77cb8d15e6e336264c6eb21b25a0fb
Component: engine
2014-01-07 11:46:07 -08:00
ec223aab35
Merge pull request #2091 from keeb/add-dco
...
Add Developer Certificate of Origin Text
Upstream-commit: 4b9e475a3d903564e17dba87ec54990967f7f66e
Component: engine
2014-01-07 10:42:53 -08:00
29b6e8dfe9
Merge pull request #3431 from shin-/ping_standalone_check
...
Check standalone header when pinging a registry server.
Upstream-commit: 1d0aeae339aefb7f242035332ed553794b9dab01
Component: engine
2014-01-07 10:33:07 -08:00
5143eb482f
Merge pull request #3475 from tianon/travis
...
Add Travis CI configuration to validate DCO and gofmt
Upstream-commit: 859856b3e46ce8f2359b30400b6f398867a84032
Component: engine
2014-01-07 10:19:43 -08:00
a4929b47af
Merge pull request #3435 from roylee17/3149-fix_port_mapping_of_tcp_plus_udp
...
Fix #3149 : port mapping of TCP + UDP
Upstream-commit: b8b18a2b428ebc9519b0dd26a18cf7b2d12cea6b
Component: engine
2014-01-07 10:08:13 -08:00
8d4b73a932
Add Travis CI configuration to validate DCO and gofmt
...
After each push, Travis CI will trigger, and check two things:
- make sure that each commit in the push has the Docker certificate of origin
- make sure that all .go files changed by this sequence of commits are correctly formatted in the most recent commit
Note: there is one edge case; if you do a git force push, we cannot figure out the actual commits in the force push, and we will just run the checks as if upstream master were the base. Pull requests will always be tested correctly, though.
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 561d1db074edd4e7e7d8b02401abd3fc11b9d51c
Component: engine
2014-01-07 08:25:54 -07:00
288d61145c
Merge pull request #3480 from tianon/gofmt
...
Run 'gofmt -s -w'
Upstream-commit: 1f9abfe841e75a9000bd670b6c1c8fed89bd772e
Component: engine
2014-01-07 06:41:23 -08:00
d1c770b847
Missing pipe in line 85
...
Upstream-commit: 2b93f1822322e957e7652db2645462ef2ec256bd
Component: engine
2014-01-07 15:20:38 +01:00
af7e2d6bbd
Run 'gofmt -s -w'
...
Upstream-commit: 8f3b8f383519452001cc05bf6505e9c301ebe954
Component: engine
2014-01-06 22:14:35 -07:00
87eb8def1e
Merge pull request #3477 from creack/fix_tar_leaks
...
Make CopyFileWithTar use a pipe instead of a buffer. Save more than 1Gb of ram for a 500Mb file.
Upstream-commit: fca83b4cfb41dbb5dcd933e4944453bac8cea0d3
Component: engine
2014-01-06 18:04:44 -08:00
c075e98c4c
Make CopyFileWithTar use a pipe instead of a buffer. Save more than 1Gb of ram for a 500Mb file.
...
Upstream-commit: 444a087ac2ca34776b2b3e4433aa35c27cdfd57a
Component: engine
2014-01-06 17:44:22 -08:00
966d13ca39
Update REMOTE_TODO.md
...
Upstream-commit: e1c861cf331b416c45a5e79102de3b44b13bf1a0
Component: engine
2014-01-06 17:37:30 -08:00
6bb653314b
Remove the @github handle as it generates emails.
...
Upstream-commit: 6fe3da9924fc22bd02eba0803abb42b10fc28baf
Component: engine
2014-01-06 17:21:14 -08:00
a9ae796dbd
Merge pull request #3473 from dhrp/docs-version-warning-fix
...
[docs] Fix for wrong version warning on master instead of latest.
Upstream-commit: f43f3fa2187450aacbb72380903b109f45d3d0cd
Component: engine
2014-01-06 16:26:04 -08:00
d7eba898f1
[docs] Fix for wrong version warning on master instead of latest.
...
Upstream-commit: 1e551c7cc5badc043b1d6a651c3f036c996ef538
Component: engine
2014-01-06 16:18:00 -08:00
7660906e4a
Merge pull request #3328 from shykes/pkg-iptables
...
Move utility package 'iptables' to pkg/iptables
Upstream-commit: 2c395ce8fb29bb64a1d6ed6d893116bf8a255c41
Component: engine
2014-01-06 15:54:07 -08:00
d5d32a285c
Move utility package 'iptables' to pkg/iptables
...
Upstream-commit: 7799ae27ca1dd85761f0595346a0dda15bbeda6c
Component: engine
2014-01-06 15:41:24 -08:00
563b24676d
Merge pull request #3388 from tianon/more-build-tests
...
Add more TestBuild Dockerfiles, especially for 'echo shebang' testing
Upstream-commit: bb754fd34d380fd59f87f6d198361c9ba7239e10
Component: engine
2014-01-06 15:14:30 -08:00
2514b9eb9b
Merge pull request #3420 from RoelVanNyen/getfullname
...
Cleanup: runtime.getFullName is deprecated by getFullName
Upstream-commit: a0298c0bd070400b4acaad3c2d285037b5875552
Component: engine
2014-01-06 13:59:04 -08:00
a94fa6d2ee
Merge pull request #3384 from tianon/fix-load-help
...
Fix "docker load" help by removing "SOURCE" prompt and mentioning STDIN
Upstream-commit: a86a82cb7e6159fc48c40b6e07e63c911100801c
Component: engine
2014-01-06 13:30:16 -08:00
29c9c05aae
Fix dotCloud to Docker, Inc
...
Upstream-commit: 36ab1836f973c62ff543456f1613dec8813d00df
Component: engine
2014-01-06 12:26:53 -08:00
