diff options
| author | Eivind Uggedal <eivind@uggedal.com> | 2014-06-07 06:05:23 +0000 |
|---|---|---|
| committer | Eivind Uggedal <eivind@uggedal.com> | 2014-06-07 06:05:29 +0000 |
| commit | 81c01908976e56b4243b85171fc05fc5bbd4dd31 (patch) | |
| tree | ad7d74891c8f37be3c7b1c6d3fcf3b28a0d15c9b /main/docker | |
| parent | 838bcec8e10868ef80df1b638d5c8650a7260e7b (diff) | |
| download | aports-81c01908976e56b4243b85171fc05fc5bbd4dd31.tar.bz2 aports-81c01908976e56b4243b85171fc05fc5bbd4dd31.tar.xz | |
main/docker: upgrade to 0.12.0
Diffstat (limited to 'main/docker')
| -rw-r--r-- | main/docker/APKBUILD | 24 | ||||
| -rw-r--r-- | main/docker/kcore-error.patch | 38 |
2 files changed, 10 insertions, 52 deletions
diff --git a/main/docker/APKBUILD b/main/docker/APKBUILD index cecd6e5c5c..bb1b949138 100644 --- a/main/docker/APKBUILD +++ b/main/docker/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Eivind Uggedal <eivind@uggedal.com> pkgname=docker -pkgver=0.11.1 -pkgrel=1 -_gitcommit=fb99f99 +pkgver=0.12.0 +pkgrel=0 +_gitcommit=14680bf pkgdesc="Pack, ship and run any application as a lightweight container" url="http://www.docker.io/" arch="x86_64" @@ -13,14 +13,13 @@ makedepends="go sqlite-dev btrfs-progs-dev bash" options="!strip" install="$pkgname.pre-install" subpackages=" - $pkgname-doc $pkgname-bash-completion:completion + $pkgname-doc $pkgname-vim:vim " source=" $pkgname-$pkgver.tar.gz::https://github.com/dotcloud/docker/archive/v$pkgver.tar.gz http://dev.alpinelinux.org/archive/$pkgname/$pkgname-man-$pkgver.tar.gz - kcore-error.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -89,12 +88,9 @@ vim() { done } -md5sums="6496901bfc30aa8094411a0dd6c10ab5 docker-0.11.1.tar.gz -ceb985bf1f68fe7e0bd500dca66eacf7 docker-man-0.11.1.tar.gz -e909f4cccd0e066be06538d0669fa4df kcore-error.patch" -sha256sums="91a65759fb5d870f215f25a1e2866204b252be8ed79778ca3f009a8ed6838c62 docker-0.11.1.tar.gz -f68612e4149d958acc18e9d607f11ed4a6189de628641a18eaf981c406c18e78 docker-man-0.11.1.tar.gz -a045e46feef94cace5c2909238351751c6b3d5bbb3fd28c6d80acd04d757a363 kcore-error.patch" -sha512sums="d035cdf2a72cd0b953d7a1a51187cd69634a2a582cd516c75b78654e883396ffb227acaeb30c9ba709c8c90404e397ae21911435ead85a30e258344c3acc803b docker-0.11.1.tar.gz -da23c045ea5abdb55884fa217c92c8016ced07d39b70c69182864503041aef7429a891dc463ffd225ff8076e50269a9a9657d785f17502aff98bd19d8bdfd547 docker-man-0.11.1.tar.gz -48d216694a9fd15dbdb3674b1506aff6ce9d3d7d5676d1a1774736ba2c9d466f5b6c0528a5a9ffe6d202cddc2598617fcd9cf8893eca5d9581cf1e29d06d2afc kcore-error.patch" +md5sums="800973801b4a833a94485cdc2f28ee30 docker-0.12.0.tar.gz +8628ab7b2f8badec557f13661c3c0107 docker-man-0.12.0.tar.gz" +sha256sums="64679e0722132ffc7a23e247150e3d70c5a4001e0c6d9dc97e85316048d09852 docker-0.12.0.tar.gz +cb7ed3c82b63fb69e2bdf31aa2535e1469ff29d076b60ad62c92a127739ddc14 docker-man-0.12.0.tar.gz" +sha512sums="08033431d97ce26d4db4c3a99accaede88fa5bf3da2fb8c8c8b99a60e0bbc4a7299f3f053573945991e5a0f5f2493cc81d6a5e69049b72035834e9a86f25a8be docker-0.12.0.tar.gz +ea4505c0ea2e6eba48e6cf8d5ef34eb1fb7b1c9b484960c4c47efa679a1d943b46a8aadb141186219d9e1a15fd8147cfa0fafcfd62799a3b9673500d5fa015cd docker-man-0.12.0.tar.gz" diff --git a/main/docker/kcore-error.patch b/main/docker/kcore-error.patch deleted file mode 100644 index 451566687e..0000000000 --- a/main/docker/kcore-error.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d60301edb88a4e182a10cd2becb3795b2dd13fab Mon Sep 17 00:00:00 2001 -From: Tianon Gravi <admwiggin@gmail.com> -Date: Thu, 8 May 2014 01:03:45 -0600 -Subject: [PATCH] Update restrict.Restrict to both show the error message when - failing to mount /dev/null over /proc/kcore, and to ignore "not exists" - errors while doing so (for when CONFIG_PROC_KCORE=n in the kernel) - -Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon) ---- - pkg/libcontainer/security/restrict/restrict.go | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/pkg/libcontainer/security/restrict/restrict.go b/pkg/libcontainer/security/restrict/restrict.go -index e1296b1..361d076 100644 ---- a/pkg/libcontainer/security/restrict/restrict.go -+++ b/pkg/libcontainer/security/restrict/restrict.go -@@ -4,6 +4,7 @@ package restrict - - import ( - "fmt" -+ "os" - "syscall" - - "github.com/dotcloud/docker/pkg/system" -@@ -18,8 +19,8 @@ func Restrict(mounts ...string) error { - return fmt.Errorf("unable to remount %s readonly: %s", dest, err) - } - } -- if err := system.Mount("/dev/null", "/proc/kcore", "", syscall.MS_BIND, ""); err != nil { -- return fmt.Errorf("unable to bind-mount /dev/null over /proc/kcore") -+ if err := system.Mount("/dev/null", "/proc/kcore", "", syscall.MS_BIND, ""); err != nil && !os.IsNotExist(err) { -+ return fmt.Errorf("unable to bind-mount /dev/null over /proc/kcore: %s", err) - } - return nil - } --- -1.9.1 - |