diff --git a/docker/.footprint b/docker/.footprint index c4e6f1d6e..24f798fab 100644 --- a/docker/.footprint +++ b/docker/.footprint @@ -11,3 +11,6 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/docker/ -rwxr-xr-x root/root usr/lib/docker/dockerinit +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/docker/ +-rwxr-xr-x root/root usr/share/docker/check-config.sh diff --git a/docker/.md5sum b/docker/.md5sum index abb004564..9be203788 100644 --- a/docker/.md5sum +++ b/docker/.md5sum @@ -1,3 +1,4 @@ +ba2a18cc02218022b2361f0a72015cf0 check-config.sh 966e1916d611427c44686ad09145996f docker.conf 139afe9c85732d52148035d62810b938 docker.rc -1a9b569b1627a51b0ce6e85eaad459c4 v0.10.0.tar.gz +6496901bfc30aa8094411a0dd6c10ab5 v0.11.1.tar.gz diff --git a/docker/Pkgfile b/docker/Pkgfile index ffe276518..706b107c0 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -2,13 +2,14 @@ # URL: http://www.docker.io/ # Maintainer: James Mills, prologic at shortcircuit dot net dot au # -# Depends on: go bridge-utils sqlite3 cgroupfs-mount +# Depends on: go sqlite3 cgroupfs-mount name=docker -version=0.10.0 -revision=dc9c28f51d +version=0.11.1 +revision=fb99f992c0 release=1 source=( + https://raw.githubusercontent.com/dotcloud/docker/master/contrib/check-config.sh https://github.com/dotcloud/$name/archive/v$version.tar.gz $name.rc $name.conf @@ -25,6 +26,8 @@ build() { ./hack/make.sh dynbinary # Package + install -D -m 755 $SRC/check-config.sh $PKG/usr/share/docker/check-config.sh + install -D -m 755 "bundles/$version/dynbinary/docker-$version" \ "$PKG/usr/bin/docker" install -D -m 755 "bundles/$version/dynbinary/dockerinit-$version" \ diff --git a/docker/README b/docker/README index 7d4d628ed..bdcf1898f 100644 --- a/docker/README +++ b/docker/README @@ -4,16 +4,11 @@ Kernel Requirements If you want to have a full working CRUX+Docker system you will need to rebuild your kernel various networking, cgroups and optional lvm options -Please review the provided ``test_kernel_config.sh`` shell script carefully -and use this to test your kernel configuration. This README does not document -what these specific options are to avoid duplication. -They are listed instead in ``test_kernel_config.sh``. - You may check your kernel configuration by running: :: - ./test_kernel_config.sh /usr/src/linux/.config + ./check-config.sh /usr/src/linux/.config Execution Engines