diff options
| author | Eivind Uggedal <eivind@uggedal.com> | 2015-09-14 19:59:43 +0000 |
|---|---|---|
| committer | Eivind Uggedal <eivind@uggedal.com> | 2015-09-14 20:06:55 +0000 |
| commit | 73f36273480c66ee5b9bc0bf3105210ae7f2da07 (patch) | |
| tree | bd1799944b8603dbeec92429d40aef7861fae122 /main | |
| parent | 9e812cfa991943d038290893c4bd9091a020239e (diff) | |
| download | aports-73f36273480c66ee5b9bc0bf3105210ae7f2da07.tar.bz2 aports-73f36273480c66ee5b9bc0bf3105210ae7f2da07.tar.xz | |
docker: fix segfault when built with go 1.5
When built with go 1.5 docker contains textrels
and segfaults in musl's dynamic linker when
trying to correct them.
Build with go-bootstrap (1.4) for now until the
issue is investigated more thoroughly.
Diffstat (limited to 'main')
| -rw-r--r-- | main/docker/APKBUILD | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/main/docker/APKBUILD b/main/docker/APKBUILD index 950ab0b8ed..a61ce976a8 100644 --- a/main/docker/APKBUILD +++ b/main/docker/APKBUILD @@ -1,16 +1,16 @@ # Maintainer: Eivind Uggedal <eivind@uggedal.com> pkgname=docker pkgver=1.8.2 -pkgrel=0 -_gitcommit=d12ea79 +pkgrel=1 +_gitcommit=0a8c2e3 pkgdesc="Pack, ship and run any application as a lightweight container" url="http://www.docker.io/" arch="x86_64" license="ASL 2.0" depends="iptables git xz" depends_dev="" -makedepends="go sqlite-dev btrfs-progs-dev bash linux-headers" -options="!strip textrels" +makedepends="go-bootstrap sqlite-dev btrfs-progs-dev bash linux-headers" +options="!strip" install="$pkgname.pre-install" subpackages=" $pkgname-bash-completion:completion @@ -42,7 +42,8 @@ build() { export DOCKER_BUILDTAGS=$_buildtags unset CC # prevent possible ccache issues - ./hack/make.sh dynbinary + PATH="/usr/lib/go-bootstrap/bin:$PATH" \ + ./hack/make.sh dynbinary } package() { |