2f6fb41dd1
Update .mailmap and AUTHORS - we're up to 316 unique contributors by my count!
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-16 20:13:51 -07:00
11ef2f0db4
Return error and not panic when cannot exec in dockerinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-16 18:31:21 -08:00
d6b810c32e
Merge pull request #3624 from tianon/vendor-maintainers
...
Symlink vendor/MAINTAINERS over to hack/MAINTAINERS
2014-01-16 17:58:28 -08:00
59fe36623b
Merge pull request #3599 from tianon/fix-install-sed
...
Fix release.sh sed of install.sh so we preserve tests against 'https://get.docker.io/ '
2014-01-16 16:54:39 -08:00
93ce4d2c0b
Merge pull request #3625 from tianon/cleanup-vendor-sh
...
Clean and simplify vendor.sh while making it easier to maintain as well
2014-01-16 16:42:52 -08:00
8cbabf2c3e
clean up test log
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-16 16:07:42 -08:00
812798a7d6
move top job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-16 16:07:42 -08:00
3155ef5cbc
Merge pull request #3616 from vieux/job_changes
...
move changes to a job
2014-01-16 15:52:57 -08:00
2cdbc719c5
Merge pull request #3583 from metalivedev/3497-copyright
...
Update docs/NOTICE copyrights to 2014
2014-01-16 12:18:34 -08:00
40b40cffb1
Clean and simplify vendor.sh while making it easier to maintain as well
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-15 22:20:51 -07:00
98111a4a94
Symlink vendor/MAINTAINERS over to hack/MAINTAINERS (since it depends explicitly on hack/vendor.sh)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-15 22:12:32 -07:00
90ec5de430
move changes to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-15 17:13:45 -08:00
20f36f088c
Merge pull request #3615 from vieux/search_job
...
move search to a job
2014-01-15 17:13:07 -08:00
1669b802cc
move search to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-15 17:12:48 -08:00
0b7d4c855d
Merge pull request #3512 from vieux/attach_job
...
move attach to a job
2014-01-15 17:12:14 -08:00
e1d8543c78
move attach to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-15 17:11:44 -08:00
c4b0eedc92
Merge pull request #3617 from dotcloud/fix_insert_display
...
fix docker insert display
2014-01-15 16:14:59 -08:00
2edcebc027
fix docker insert display
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-15 15:41:57 -08:00
44b8d8addf
Merge pull request #3559 from vieux/insert_job
...
move insert to a job
2014-01-15 15:18:02 -08:00
a33bc3018b
use the same 'Used' method as before
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-15 14:52:58 -08:00
0fb8a55753
move insert to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-15 14:52:58 -08:00
52ec95f363
Merge pull request #3560 from vieux/copy_job
...
move copy to a job
2014-01-15 14:48:51 -08:00
e2fa3f56df
move copy to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-15 14:48:31 -08:00
f213e2dd6c
Merge pull request #3613 from vieux/deprecated_viz_job
...
move viz to a job
2014-01-15 14:47:56 -08:00
a98e40fa73
update TODO
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-15 14:47:35 -08:00
7fbc315aa9
move viz to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-15 13:52:35 -08:00
cdea7d3b5f
Merge pull request #3598 from tianon/fix-vieux-docs-errors-again
...
Fix odd issues with "make docs", add "make docs-shell", and canonicalize...
2014-01-15 13:42:28 -08:00
0113c087b2
Merge pull request #3593 from dotcloud/fix_doc
...
fix doc, load and get
2014-01-15 13:33:00 -08:00
78138344a4
Merge pull request #3606 from jpallen/1319-fix-race-condition-in-truncindex
...
Add RWMutex lock into TruncIndex to fix race condition when inserting values
2014-01-15 11:41:51 -08:00
7e00ba03ec
fix doc, load and get
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-15 11:12:05 -08:00
ad5d675553
Merge pull request #3582 from vieux/history_job
...
move history to a job
2014-01-15 11:06:54 -08:00
7898dca8b3
fix tests & small code improvment
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-15 11:06:00 -08:00
5a91781ef9
Merge pull request #3608 from crosbymichael/merge_release_v0.7.6
...
Merge release v0.7.6 to master
2014-01-15 10:41:43 -08:00
3ef777ecbe
Merge branch 'release' into merge_release_v0.7.6
...
Conflicts:
VERSION
hack/make/ubuntu
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-15 09:54:06 -08:00
4934c35aa1
Merge pull request #3597 from crosbymichael/bump_v0.7.6
...
Bump to version v0.7.6
2014-01-15 09:40:43 -08:00
37fcbfa1f4
Add RWMutex lock into TruncIndex to fix race condition when inserting values
...
The idx.index array is overwritten when a new value is inserted to the index.
When two containers are created concurrently, their ids are inserted to the
index and one can overwrite the other leaving one of ids missing from the
index. Adding a RWMutex lock around read/write operations fixes this.
Docker-DCO-1.1-Signed-off-by: James Allen <jamesallen0108@gmail.com> (github: jpallen)
2014-01-15 17:30:00 +00:00
dbf249e239
Merge pull request #3508 from tutumcloud/seccomp
...
Add capabilities needed by new sysinit to mkseccomp.pl sample list
2014-01-14 18:55:53 -08:00
221454f315
Fix release.sh sed of install.sh so we preserve tests against ' https://get.docker.io/ '
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-14 19:29:02 -07:00
eaa9c85511
Fix odd issues with "make docs", add "make docs-shell", and canonicalize our docs Dockerfile a bit more
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-14 19:23:30 -07:00
bc3b2ec062
Bump to version v0.7.6
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-14 17:53:20 -08:00
d103b6f6df
Add more specific lvm2 version to PACKAGERS document
...
I personally tested this using our container, and this was the lowest version that compiles and runs properly.
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com> (github: crosbymichael)
2014-01-14 17:29:25 -08:00
07b50a90a8
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)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com> (github: crosbymichael)
2014-01-14 17:27:51 -08:00
75293b12b3
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)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com> (github: crosbymichael)
2014-01-14 17:27:34 -08:00
734b4566df
Use https to get the latest docker version
...
To avoid unexpected results since docker was using http.
For instance, my broadband doesn't return not found when it's down but
a html page saying that the internet is down. Docker was showing that
html instead of ignoring it.
Fix #3570
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: crosbymichael)
2014-01-14 17:27:12 -08:00
8d19b2caa0
Add remount for bind mounts in ro
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-14 17:26:34 -08:00
42fed841d3
Fix "foo: no such file or directory" test failure, and normalize creation of custom error to always depend on if os.IsNotExist(err) so we don't hide other errors that might crop up in these tests
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com> (github: crosbymichael)
2014-01-14 17:25:35 -08:00
ad69836247
Stop ADD from following symlinks outside the context when passed as the first argument
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com> (github: crosbymichael)
2014-01-14 17:25:26 -08:00
152c956719
Merge pull request #3594 from crosbymichael/add-bind-remount
...
Add remount for bind mounts in ro
2014-01-14 16:57:55 -08:00
f231539e99
Add remount for bind mounts in ro
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-14 15:20:21 -08:00
bfc256f6c9
Merge pull request #3581 from tianon/deb-xz-utils
...
Add xz-utils to our deb-recommends since it's necessary for some images
2014-01-14 12:07:10 -08:00
Tianon Gravi
Michael Crosby
Victor Vieux
Andy Rothfusz
Guillaume J. Charmes
James Allen
Fabio Falci