Michael Crosby
d7f26c93d9
Change version to v0.7.4-dev
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-07 18:41:06 -08:00
Michael Crosby
d4e61b48eb
Merge branch 'release' into merege_release_v0.7.4
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-07 18:40:54 -08:00
Michael Crosby
1a6fc02348
Merge pull request #3495 from crosbymichael/bump_v0.7.4
...
Bump v0.7.4
2014-01-07 18:35:44 -08:00
Michael Crosby
010d74ec2f
Bump to v0.7.4
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-07 18:06:20 -08:00
Tianon Gravi
a25a80b2d3
Merge pull request #3361 from zimbatm/gpg-key-secure-best
...
Makes sure the GPG fingerprint is inlined in the doc everywhere.
2014-01-07 17:43:04 -08:00
Guillaume J. Charmes
bb76985d39
Merge pull request #3474 from creack/fix_add_cache_issue
...
Fix ADD caching issue with . prefixed path
2014-01-07 17:24:18 -08:00
Guillaume J. Charmes
28ec47c441
Merge pull request #3492 from unclejack/3449-fix_docker_build_on_devicemapper
...
#3449 - fix `docker build` on devicemapper
2014-01-07 17:12:31 -08:00
zimbatm
94c803e9f0
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)
2014-01-08 01:08:14 +00:00
zimbatm
13ebc68636
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)
2014-01-08 01:07:04 +00:00
unclejack
d003cfea25
Revert "Add -S option to tar for efficient sparse file handling"
...
This reverts commit 733bf5d3dd
.
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)
2014-01-08 02:58:39 +02:00
Guillaume J. Charmes
f3103e5c91
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)
2014-01-07 16:53:55 -08:00
Guillaume J. Charmes
ef7e000a13
Make vfs error more explicit
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-01-07 16:02:41 -08:00
Guillaume J. Charmes
811341423b
Fix ADD caching issue with . prefixed path
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <charmes.guillaume@gmail.com> (github: creack)
2014-01-07 16:02:20 -08:00
Andy Rothfusz
b3addb5fb8
Merge pull request #3430 from lsm5/fedora-official-image
...
install instructions use unprefixed fedora image
2014-01-07 15:12:37 -08:00
Andy Rothfusz
00ee6d1925
Merge pull request #3483 from lukaspustina/patch-1
...
Missing redirect in line 85
2014-01-07 15:11:02 -08:00
Andy Rothfusz
6f8a79c23c
Merge pull request #3462 from tsaavik/patch-2
...
Simplified and streamlined Amazon Quickstart
2014-01-07 15:09:35 -08:00
Andy Rothfusz
cf8063d152
Merge pull request #3461 from jbeda/patch-1
...
Update instructions for mtu flag for Docker on GCE
2014-01-07 15:03:19 -08:00
Andy Rothfusz
3e10fe1a15
Merge pull request #3488 from jamtur01/1310
...
Fixed #3481 - Added Ubuntu Saucy to installation
2014-01-07 14:56:03 -08:00
Michael Crosby
45ecdf9c8e
Merge pull request #3487 from crosbymichael/improve-images-speed
...
Only get rootfs when we need to calculate the image size
2014-01-07 14:47:31 -08:00
Tianon Gravi
b942f24ba8
Merge pull request #3491 from tianon/travis-numeric-commit
...
Fix Travis handling of a fully-numeric commit hash being YAML-converted ...
2014-01-07 14:35:06 -08:00
Tianon Gravi
3779291e9b
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)
2014-01-07 15:27:51 -07:00
Michael Crosby
fa14a1b983
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)
2014-01-07 13:56:26 -08:00
Tianon Gravi
f9e14cc838
Merge pull request #3489 from tianon/travis-fixes
...
Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master"
2014-01-07 12:53:19 -08:00
Victor Vieux
f2ea539467
Update REMOTE_TODO.md
2014-01-07 12:51:17 -08:00
Tianon Gravi
7c4e5fbd46
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)
2014-01-07 13:45:40 -07:00
James Turnbull
97ef8a067c
Fixed #3481 - Added Ubuntu Saucy to installation
...
Docker-DCO-1.0-Signed-off-by: James Turnbull <james@lovedthanlost.net> jamtur01
2014-01-07 11:46:07 -08:00
Michael Crosby
4b9e475a3d
Merge pull request #2091 from keeb/add-dco
...
Add Developer Certificate of Origin Text
2014-01-07 10:42:53 -08:00
Michael Crosby
1d0aeae339
Merge pull request #3431 from shin-/ping_standalone_check
...
Check standalone header when pinging a registry server.
2014-01-07 10:33:07 -08:00
Solomon Hykes
859856b3e4
Merge pull request #3475 from tianon/travis
...
Add Travis CI configuration to validate DCO and gofmt
2014-01-07 10:19:43 -08:00
Michael Crosby
b8b18a2b42
Merge pull request #3435 from roylee17/3149-fix_port_mapping_of_tcp_plus_udp
...
Fix #3149 : port mapping of TCP + UDP
2014-01-07 10:08:13 -08:00
Tianon Gravi
561d1db074
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)
2014-01-07 08:25:54 -07:00
Michael Crosby
1f9abfe841
Merge pull request #3480 from tianon/gofmt
...
Run 'gofmt -s -w'
2014-01-07 06:41:23 -08:00
lukaspustina
2b93f18223
Missing pipe in line 85
2014-01-07 15:20:38 +01:00
Tianon Gravi
8f3b8f3835
Run 'gofmt -s -w'
2014-01-06 22:14:35 -07:00
Michael Crosby
fca83b4cfb
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.
2014-01-06 18:04:44 -08:00
Guillaume J. Charmes
444a087ac2
Make CopyFileWithTar use a pipe instead of a buffer. Save more than 1Gb of ram for a 500Mb file.
2014-01-06 17:44:22 -08:00
Victor Vieux
e1c861cf33
Update REMOTE_TODO.md
2014-01-06 17:37:30 -08:00
Nick Stinemates
6fe3da9924
Remove the @github handle as it generates emails.
2014-01-06 17:21:14 -08:00
Andy Rothfusz
f43f3fa218
Merge pull request #3473 from dhrp/docs-version-warning-fix
...
[docs] Fix for wrong version warning on master instead of latest.
2014-01-06 16:26:04 -08:00
Thatcher Peskens
1e551c7cc5
[docs] Fix for wrong version warning on master instead of latest.
2014-01-06 16:18:00 -08:00
Michael Crosby
2c395ce8fb
Merge pull request #3328 from shykes/pkg-iptables
...
Move utility package 'iptables' to pkg/iptables
2014-01-06 15:54:07 -08:00
Solomon Hykes
7799ae27ca
Move utility package 'iptables' to pkg/iptables
2014-01-06 15:41:24 -08:00
Michael Crosby
bb754fd34d
Merge pull request #3388 from tianon/more-build-tests
...
Add more TestBuild Dockerfiles, especially for 'echo shebang' testing
2014-01-06 15:14:30 -08:00
Victor Vieux
a0298c0bd0
Merge pull request #3420 from RoelVanNyen/getfullname
...
Cleanup: runtime.getFullName is deprecated by getFullName
2014-01-06 13:59:04 -08:00
Victor Vieux
a86a82cb7e
Merge pull request #3384 from tianon/fix-load-help
...
Fix "docker load" help by removing "SOURCE" prompt and mentioning STDIN
2014-01-06 13:30:16 -08:00
Nick Stinemates
36ab1836f9
Fix dotCloud to Docker, Inc
2014-01-06 12:26:53 -08:00
shin-
5e8912e0e8
Fixed registry unit tests
2014-01-06 21:04:44 +01:00
Victor Vieux
4e414f6205
Merge pull request #3377 from cpuguy83/3333-fix_-H_default
...
Make blank -H option default to the same as no -H was sent
2014-01-06 11:30:27 -08:00
Michael Crosby
4f31141e13
Merge pull request #3310 from pnasrat/cgroups-subpackage
...
Extract cgroups utilities to own submodule.
2014-01-06 11:27:29 -08:00
Michael Crosby
ee6823d797
Merge pull request #3297 from jaseg/master
...
Return meaningful error for meaningless Dockerfiles
2014-01-06 10:58:24 -08:00