aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-02-05 14:29:11 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-02-05 14:31:38 +0000
commitc5268eb8041f204620e7f41a357cdcbcfc7bddd4 (patch)
treed2b22cdb24e74c1c02ced384ffa27e597871fc61 /testing
parentc46d50039feca3d368b23cf04876ab7bcc5664ea (diff)
downloadaports-c5268eb8041f204620e7f41a357cdcbcfc7bddd4.tar.bz2
aports-c5268eb8041f204620e7f41a357cdcbcfc7bddd4.tar.xz
community/docker: upgrade to 1.10.0
Diffstat (limited to 'testing')
-rw-r--r--testing/docker/APKBUILD102
-rw-r--r--testing/docker/docker.pre-install6
-rw-r--r--testing/docker/openrc-fixes.patch34
3 files changed, 0 insertions, 142 deletions
diff --git a/testing/docker/APKBUILD b/testing/docker/APKBUILD
deleted file mode 100644
index 8c989f70ef..0000000000
--- a/testing/docker/APKBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# Maintainer: Eivind Uggedal <eivind@uggedal.com>
-pkgname=docker
-pkgver=1.10.0_rc4
-pkgrel=0
-_ver=${pkgver/_rc/-rc}
-_gitcommit=677c593
-pkgdesc="Pack, ship and run any application as a lightweight container"
-url="http://www.docker.io/"
-arch="all"
-license="ASL 2.0"
-depends="iptables git xz"
-depends_dev=""
-makedepends="go sqlite-dev btrfs-progs-dev bash linux-headers"
-options="!strip"
-install="$pkgname.pre-install"
-subpackages="
- $pkgname-bash-completion:bashcomp
- $pkgname-zsh-completion:zshcomp
- $pkgname-vim:vim
- "
-source="
- $pkgname-$_ver.tar.gz::https://github.com/docker/docker/archive/v$_ver.tar.gz
- openrc-fixes.patch
- "
-
-_builddir="$srcdir"/$pkgname-$_ver
-_buildtags="exclude_graphdriver_aufs exclude_graphdriver_devicemapper"
-
-prepare() {
- local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
-
-build() {
- cd "$_builddir"
-
- export AUTO_GOPATH=1
- export DOCKER_GITCOMMIT=$_gitcommit
- export DOCKER_BUILDTAGS=$_buildtags
- unset CC # prevent possible ccache issues
-
- ./hack/make.sh dynbinary
-}
-
-package() {
- cd "$_builddir"
- local ver=$(cat VERSION)
-
- install -Dm755 bundles/$ver/dynbinary/docker-$ver \
- "$pkgdir"/usr/bin/docker
- install -Dm755 bundles/$ver/dynbinary/dockerinit-$ver \
- "$pkgdir"/usr/lib/docker/dockerinit
-
- install -Dm755 contrib/init/openrc/docker.initd \
- "$pkgdir"/etc/init.d/docker
- install -Dm644 contrib/init/openrc/docker.confd \
- "$pkgdir"/etc/conf.d/docker
-}
-
-bashcomp() {
- pkgdesc="Bash completion for Docker"
- arch="noarch"
- depends=""
- install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
- install -Dm644 "$_builddir"/contrib/completion/bash/$pkgname \
- "$subpkgdir"/usr/share/bash-completion/completions/$pkgname
-}
-
-zshcomp() {
- pkgdesc="Zsh completion for $pkgname"
- arch="noarch"
- depends=""
- install_if="$pkgname=$pkgver-r$pkgrel zsh"
-
- install -Dm644 "$_builddir"/contrib/completion/zsh/_$pkgname \
- "$subpkgdir"/usr/share/zsh/site-functions/_$pkgname || return 1
-}
-
-vim() {
- depends=""
- pkgdesc="Vim syntax for Docker"
- arch="noarch"
-
- local f=
- for f in ftdetect/dockerfile.vim syntax/dockerfile.vim; do
- install -Dm644 "$_builddir"/contrib/syntax/vim/$f \
- "$subpkgdir"/usr/share/vim/vimfiles/$f
- done
-}
-
-md5sums="43c2117a96b46d567197355ebd74f6e2 docker-1.10.0-rc4.tar.gz
-506e32a6157a7f92e67511111fba6fe8 openrc-fixes.patch"
-sha256sums="db5900489017b938914f829c81b9481c41aa2fd70d9075529f66540f5ee801de docker-1.10.0-rc4.tar.gz
-864d229e21dfa6c931b29b908093302a48837ddb1aa4205088f6f7fd4d7da4e3 openrc-fixes.patch"
-sha512sums="bf6ada256af430c24f14787e3da404afccb22c43faa4f38fbbe5f70cac41d497b9700f2d0dfdea53031f4564435b60cf405a492d7d9d07ef1e5f50e8b5b92984 docker-1.10.0-rc4.tar.gz
-1162f62e8a7a5ded0c54cfe46014449efd67491bdb678fa22862117adb08206c909a3f98b0062125d25256dc1f48596b696bd4b19a8804d2862e758678a8bb62 openrc-fixes.patch"
diff --git a/testing/docker/docker.pre-install b/testing/docker/docker.pre-install
deleted file mode 100644
index 8a1dec6f2a..0000000000
--- a/testing/docker/docker.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if ! getent group docker >/dev/null; then
- addgroup -S docker
-fi
-exit 0
diff --git a/testing/docker/openrc-fixes.patch b/testing/docker/openrc-fixes.patch
deleted file mode 100644
index f350daaf93..0000000000
--- a/testing/docker/openrc-fixes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/contrib/init/openrc/docker.initd b/contrib/init/openrc/docker.initd
-index 26fa8ef..ea8a3b2 100644
---- a/contrib/init/openrc/docker.initd
-+++ b/contrib/init/openrc/docker.initd
-@@ -9,11 +9,18 @@ DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}"
- start_stop_daemon_args="--background \
- --stderr \"${DOCKER_LOGFILE}\" --stdout \"${DOCKER_LOGFILE}\""
-
-+grsecdir=/proc/sys/kernel/grsecurity
-+
- start_pre() {
- checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"
-+ for i in $disable_grsec; do
-+ if [ -e "$grsecdir/$i" ]; then
-+ einfo " Disabling $i"
-+ echo 0 > "$grsecdir/$i"
-+ fi
-+ done
-
- ulimit -n 1048576
-- ulimit -u 1048576
-
- return 0
- }
-
---- a/contrib/init/openrc/docker.confd 2015-02-10 17:14:37.000000000 -0100
-+++ b/contrib/init/openrc/docker.confd 2015-03-31 14:52:47.323685914 -0200
-@@ -11,3 +11,6 @@
-
- # any other random options you want to pass to docker
- DOCKER_OPTS=""
-+
-+# disable grsecurity features
-+#disable_grsec="chroot_deny_chmod chroot_deny_mknod"