Commit Graph

5560 Commits

Author SHA1 Message Date
b04df34a21 Merge pull request #3598 from tianon/fix-vieux-docs-errors-again
Fix odd issues with "make docs", add "make docs-shell", and canonicalize...
Upstream-commit: cdea7d3b5f64b8d255bab657a79082ec282da96a
Component: engine
2014-01-15 13:42:28 -08:00
403789e5fb Merge pull request #3593 from dotcloud/fix_doc
fix doc, load and get
Upstream-commit: 0113c087b22c7ffe03c4745bc9d05a0523ecbe5c
Component: engine
2014-01-15 13:33:00 -08:00
96b89ef5bc Merge pull request #3606 from jpallen/1319-fix-race-condition-in-truncindex
Add RWMutex lock into TruncIndex to fix race condition when inserting values
Upstream-commit: 78138344a4715729332d1c849eee263c1f6c58f5
Component: engine
2014-01-15 11:41:51 -08:00
4a2036105a fix doc, load and get
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 7e00ba03ecd4f1b30e49dbc07160b09929dd786c
Component: engine
2014-01-15 11:12:05 -08:00
44317b0896 Merge pull request #3582 from vieux/history_job
move history to a job
Upstream-commit: ad5d67555387608b0ee16be2821ac2967ff9e0b4
Component: engine
2014-01-15 11:06:54 -08:00
708fd3d625 fix tests & small code improvment
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 7898dca8b3d1835d15812bd5249fcfb0de73257b
Component: engine
2014-01-15 11:06:00 -08:00
8714c026e9 Merge pull request #3608 from crosbymichael/merge_release_v0.7.6
Merge release v0.7.6 to master
Upstream-commit: 5a91781ef90e0144fe098cdb326dcb929013caf8
Component: engine
2014-01-15 10:41:43 -08:00
4439430c2f 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)
Upstream-commit: 3ef777ecbe439b8079715b5879f067b95e31c31b
Component: engine
2014-01-15 09:54:06 -08:00
68ff82ba27 Merge pull request #3597 from crosbymichael/bump_v0.7.6
Bump to version v0.7.6
Upstream-commit: 4934c35aa115df18867d16943dfb76263c188428
Component: engine
2014-01-15 09:40:43 -08:00
82c7a6024b 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)
Upstream-commit: 37fcbfa1f4586e4437664239fc271dda31ac1837
Component: engine
2014-01-15 17:30:00 +00:00
e0dd1f369c Merge pull request #3508 from tutumcloud/seccomp
Add capabilities needed by new sysinit to mkseccomp.pl sample list
Upstream-commit: dbf249e23925decac52c0176d716c0ce205d4326
Component: engine
2014-01-14 18:55:53 -08:00
0f4b49bea8 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)
Upstream-commit: eaa9c85511620aa82f1876e1503604f591f00d23
Component: engine
2014-01-14 19:23:30 -07:00
b10c6d4b20 Bump to version v0.7.6
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: bc3b2ec0622f50879ae96f042056b6bd2e0b4fba
Component: engine
2014-01-14 17:53:20 -08:00
d7b1a1cd7e 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)
Upstream-commit: d103b6f6df74a9fe54b6af747c497641f5b19937
Component: engine
2014-01-14 17:29:25 -08:00
ae761af29a 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)
Upstream-commit: 07b50a90a8e7380b781d75dda3773eb23cafb131
Component: engine
2014-01-14 17:27:51 -08:00
e593ed8d0c 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)
Upstream-commit: 75293b12b36b3eef6706cf85f291be96500a40da
Component: engine
2014-01-14 17:27:34 -08:00
6b97b22177 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)
Upstream-commit: 734b4566df879c2c071a9785d69b2c9c51d76b06
Component: engine
2014-01-14 17:27:12 -08:00
b5f70141c8 Add remount for bind mounts in ro
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8d19b2caa01535202c2fa82913ad99ec2594032a
Component: engine
2014-01-14 17:26:34 -08:00
e38e237f14 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)
Upstream-commit: 42fed841d3735658d738aff34e135f8e461012dd
Component: engine
2014-01-14 17:25:35 -08:00
5171dc92dc 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)
Upstream-commit: ad6983624745cbb7c8f5bd7fd22c68f190b42004
Component: engine
2014-01-14 17:25:26 -08:00
3b5474f989 Merge pull request #3594 from crosbymichael/add-bind-remount
Add remount for bind mounts in ro
Upstream-commit: 152c95671947af5513be1148371b8ee0a7ca709a
Component: engine
2014-01-14 16:57:55 -08:00
f50ee0d154 Add remount for bind mounts in ro
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f231539e995a70a49903e9a852535d2c8a8eca43
Component: engine
2014-01-14 15:20:21 -08:00
6a213b9da5 Merge pull request #3581 from tianon/deb-xz-utils
Add xz-utils to our deb-recommends since it's necessary for some images
Upstream-commit: bfc256f6c99461d2051bebc611bb06287b58a867
Component: engine
2014-01-14 12:07:10 -08:00
1d30604adf Merge pull request #3592 from tianon/fix-travis-vendor
Fix Travis to not check gofmt on vendor/*
Upstream-commit: 12d00d19bb5c43c3a7a1c0e051ca52af4d47034c
Component: engine
2014-01-14 11:52:08 -08:00
b5e5ccfa24 Merge pull request #3567 from tianon/dockerfile-add-symlink
Stop ADD from following symlinks outside the context when passed as the first argument
Upstream-commit: feb3f9841813e3f1fdade2eba9ee6b7ede21258e
Component: engine
2014-01-14 11:48:54 -08:00
07247c041c Merge pull request #3585 from tianon/remove-uid-ns-reference
Remove reference to nonexistent CONFIG_UID_NS
Upstream-commit: be44bf81704bd06c5665759d24612c0b1e205a81
Component: engine
2014-01-14 11:37:00 -08:00
aa714b58c1 Merge pull request #3586 from flavio/add_openSUSE_installation_docs
Added document explaining openSUSE installation
Upstream-commit: da78dd0eb82419f7f7438649ca95fbe6741dd5d1
Component: engine
2014-01-14 11:36:15 -08:00
9af93e62a4 move history to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: bea6dd3888adefd070544241177860864f62fb25
Component: engine
2014-01-14 10:52:42 -08:00
c10cddede6 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)
Upstream-commit: 7a6255efbcb83458ca179b2148fda7a0160a4bd7
Component: engine
2014-01-14 11:42:03 -07:00
b0844afbd1 added capabilities needed by new sysinit
Docker-DCO-1.1-Signed-off-by: Fernando Mayo <fernando@tutum.co> (github: fermayo)
Upstream-commit: 32565a4451c9c7f929a37d61ded70fc1de7fe993
Component: engine
2014-01-14 19:27:31 +01:00
d56dd5badf Fix Travis to not check gofmt on vendor/*
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f700aa15705c418d6523b7ecb7c6e7413deaed13
Component: engine
2014-01-14 11:07:18 -07:00
db61a6c8b1 Merge pull request #3591 from tianon/fix-vendor
Un-gofmt ./vendor
Upstream-commit: bdcd1cfba5bdb2357260e566c7d3fdb9c9380362
Component: engine
2014-01-14 10:06:11 -08:00
4f97e42486 Merge pull request #3534 from philips/reformat-DCO
CONTRIBUTING.md: wrap DCO to 78 chars per line
Upstream-commit: a49efa975eb0fc59cf6d2363668308a1a7c5b4d7
Component: engine
2014-01-14 10:00:14 -08:00
da50584226 Un-gofmt ./vendor
We can't be modifying this except to update from upstream.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e8ffc2eee00beaa8456d69853ad9ca3db29ea013
Component: engine
2014-01-14 10:54:19 -07:00
eeaaa01f6d Merge pull request #3570 from fabiofalci/3569-validate-docker-version
Fetch docker version over https
Upstream-commit: b68ddcec21d40323b3a7bf7dca5d9eb99cb5d4f5
Component: engine
2014-01-14 09:36:18 -08:00
d1113f9ba8 Merge pull request #3587 from tianon/fix-gentoo-typo
Fix docs typo: "Gento" -> "Gentoo"
Upstream-commit: 7d702ef501f53d99e5caf9535584320342cfee4b
Component: engine
2014-01-14 09:22:58 -08:00
3cbd5b3f6e Added document explaining openSUSE installation
Added a new documentation page explaining how to install Docker on
openSUSE.

Docker-DCO-1.1-Signed-off-by: Flavio Castelli <fcastelli@suse.com> (github: flavio)
Upstream-commit: 3a1ce011a02ee42441b895b1f636c9e7363e2625
Component: engine
2014-01-14 16:26:18 +01:00
762ef6b753 Fix docs typo: "Gento" -> "Gentoo"
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c7dcd19b28c069a396b3b9688886f9c88730e86d
Component: engine
2014-01-14 04:18:51 -07:00
1c76e8444d Remove reference to nonexistent CONFIG_UID_NS
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 658f57fdfa488968cc63d866b9e3689345a3f199
Component: engine
2014-01-13 23:32:21 -07:00
197d847462 Merge pull request #3584 from tianon/fix-docs-dockerfile
Fix docs Dockerfile to install correctly again
Upstream-commit: fe6c9e8fd7cef9bae224dd66a59696dcb025db49
Component: engine
2014-01-13 17:42:20 -08:00
bfbc1e39c3 Fix docs Dockerfile to install correctly again
Previously we've been getting:

```
Step 6 : RUN pip install Sphinx==1.1.3
 ---> Running in 397eab32f57a
 Wheel installs require setuptools >= 0.8 for dist-info support.
 pip's wheel support requires setuptools >= 0.8 for dist-info support.
 Storing debug log for failure in /.pip/pip.log
 2014/01/13 18:01:34 The command [/bin/sh -c pip install Sphinx==1.1.3] returned a non-zero code: 1
 make: *** [docs] Error 1
```

This fixes that by telling pip not to use sudo to install (since we're already root).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 4087a643eaf6265f8d238caa2883348eeb5e908a
Component: engine
2014-01-13 18:22:23 -07:00
5a3f85190a Merge pull request #3575 from shykes/engine-get-images
move `docker images` to a job
Upstream-commit: 9792df20804e9cd5736ab933c6ffcb29fd52040e
Component: engine
2014-01-13 16:25:23 -08:00
a8444009df move legacy stuff outside the job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 16ca6a1c12ffe9a02da4e823646bee6461ffbad5
Component: engine
2014-01-13 16:20:05 -08:00
27c595f866 add legacy compat
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: aca1270104802347f5aa3104959282924b631daa
Component: engine
2014-01-13 15:50:20 -08:00
1ccf04f8d4 Add compat 1.8
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 3a610f754f425ea6042c3f8b5452273656a06c90
Component: engine
2014-01-13 15:50:20 -08:00
5f902c5a09 Port 'docker images' to the engine API
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 17a806c8a0b6add2aa773dfca272acefee9b638c
Component: engine
2014-01-13 15:49:33 -08:00
b4e3b1bdeb Add xz-utils to our deb-recommends since it's necessary for some images
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 1004c2d3d8ed826e6568f6640ac6aa3160f31a8d
Component: engine
2014-01-13 16:25:23 -07:00
be95f4675e 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)
Upstream-commit: 89bed4337d2314c3ffaac231c141b635ecc65ac5
Component: engine
2014-01-13 20:37:29 +00:00
e42df33e3b Merge pull request #3544 from SvenDowideit/build-image-cache
add info and example of image cache in use when building
Upstream-commit: 6652416f4c18bd59575c7788747335eab7b4d304
Component: engine
2014-01-13 11:10:29 -08:00
2822354d30 add info and example of image cache in use when building
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)

Docker-DCO-1.0-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: f30ca8935d128bbd060a04b47cec2f26d682797b
Component: engine
2014-01-13 22:17:47 +10:00