diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/docker/docker.SlackBuild | 14 | ||||
| -rw-r--r-- | system/docker/docker.info | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild index c45efa453a..0ddebed416 100644 --- a/system/docker/docker.SlackBuild +++ b/system/docker/docker.SlackBuild @@ -5,11 +5,11 @@ # Written by Vincent Batts <vbatts@hashbangbash.com> PRGNAM=docker -VERSION=${VERSION:-1.1.1} +VERSION=${VERSION:-1.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -GITHASH=${GITHASH:-bd609d2} +GITHASH=${GITHASH:-fa7b24f} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -58,13 +58,13 @@ unset GOPATH # back out this commit, which causes btrfs headers to not be found on slackware # since btrfs-progs removes the <btrfs/ioctl.h> header. -# https://github.com/dotcloud/docker/commit/6922f1be08111d889b0585b763b08f92d7a55e05 +# https://github.com/docker/docker/commit/6922f1be08111d889b0585b763b08f92d7a55e05 patch -p1 -R < $CWD/docker-btrfs.patch -mkdir -p ${PKG}/usr/share/gocode/src/github.com/dotcloud/docker -cp -a . ${PKG}/usr/share/gocode/src/github.com/dotcloud/docker/ +mkdir -p ${PKG}/usr/share/gocode/src/github.com/docker/docker +cp -a . ${PKG}/usr/share/gocode/src/github.com/docker/docker/ -GOPATH=${PKG}/usr/share/gocode:$(pwd)/vendor \ +export GOPATH=${PKG}/usr/share/gocode:$(pwd)/vendor DOCKER_GITCOMMIT="$GITHASH" \ ./hack/make.sh dynbinary @@ -78,7 +78,7 @@ install -D --mode 0644 $CWD/config/docker.logrotate $PKG/etc/logrotate.d/docker. install -D --mode 0755 $CWD/config/rc.docker $PKG/etc/rc.d/rc.docker.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CONTRIBUTING.md CHANGELOG.md FIXME LICENSE README.md NOTICE VERSION \ +cp -a AUTHORS CONTRIBUTING.md CHANGELOG.md LICENSE README.md NOTICE VERSION \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/docker/docker.info b/system/docker/docker.info index 56262c74f1..bf2a3630ab 100644 --- a/system/docker/docker.info +++ b/system/docker/docker.info @@ -1,8 +1,8 @@ PRGNAM="docker" -VERSION="1.1.1" +VERSION="1.2.0" HOMEPAGE="https://docker.io/" -DOWNLOAD="https://github.com/dotcloud/docker/archive/v1.1.1.tar.gz" -MD5SUM="2f1fad2a1c696a46bad6823a43897a6c" +DOWNLOAD="https://github.com/docker/docker/archive/v1.2.0.tar.gz" +MD5SUM="cea0b533c0fae5d2aaef6b3abd92af5d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="google-go-lang" |