Commit Graph

21804 Commits

Author SHA1 Message Date
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
aa9b4113c7 Add a few small tweaks to mkimage-debootstrap, especially to help with lucid
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 5a3fa3c901bfc226456f3caa13d26b77e5ca2f4d
Component: engine
2014-01-14 04:20:27 -07: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
d37b5ad2d1 Implement UnTar via archive/tar
This replaces the shelling out to tar with a reimplementation of untar
based on the archive/tar code and the pre-existing code from ApplyLayer
to create real files from tar headers.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: a4868e233c7ebce259fc02d3dbfb241c23471a4a
Component: engine
2014-01-14 11:21:29 +01:00
f97f40c214 archive: Extract createTarFile() from ApplyLayer
This way we can reuse it for Untar()

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 710d5a48fb751623fbf77a51b89f2dfbf0edac68
Component: engine
2014-01-14 11:21:07 +01: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
7cecb31982 Fixes 3497
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: @metalivedev)
Upstream-commit: a92699ab6c0f93ee155b44145790dfeaf54cf1c8
Component: engine
2014-01-13 17:12:53 -08: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
c4546db20c Discard all data on devicemapper devices when deleting them
This works around the fact that deleting a device in a thin pool
doesn't discard the free space. Unfortunately even this is not perfect,
as it seems discards are respected only for blocks that has never been
shared in the thin device code. However, this has been fixed in the
upstream kernel device-mapper tree:

http://git.kernel.org/cgit/linux/kernel/git/device-mapper/linux-dm.git/commit/?h=for-next&id=0ab1c92ff748b745c1ed7cde31bb37ad2c5f901a

When this hits the kernel I belive this will fully return space
for removed images/containers to the host FS. For now it only
helps partially (which is better than nothing).

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 93e120e7d67313086d8bdecbcb57ea68958f91e4
Component: engine
2014-01-13 13:41:04 +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
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
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
3dc8c2a33a 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)
Upstream-commit: fb63cfa9a502e2410597422f8877cf16b0bbaad2
Component: engine
2014-01-11 05:46:11 -07: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
f19f8cb54e Add support for RUN [""] in Dockerfiles for greater specificity in what is actually executed
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: fd78128870b78c282b65976cfff100c4101569b1
Component: engine
2014-01-11 04:00:52 -07: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