From 4fd3238892636cd42092eebdb56f0067c1b098db Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Mon, 30 Nov 2015 11:56:21 -0800 Subject: [PATCH] fix gopath when building debs Signed-off-by: Jessica Frazelle Upstream-commit: 4935f7f500b8473ce53848e0c9673bac7a9fb522 Component: engine --- components/engine/hack/make/build-deb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/engine/hack/make/build-deb b/components/engine/hack/make/build-deb index 418d9a1947..74d24a2ffd 100644 --- a/components/engine/hack/make/build-deb +++ b/components/engine/hack/make/build-deb @@ -52,12 +52,14 @@ set -e FROM $image WORKDIR /usr/src/docker COPY . /usr/src/docker + RUN mkdir -p /go/src/github.com/docker \ + && ln -snf /usr/src/docker /go/src/github.com/docker/docker EOF if [ "$DOCKER_EXPERIMENTAL" ]; then echo 'ENV DOCKER_EXPERIMENTAL 1' >> "$DEST/$version/Dockerfile.build" fi cat >> "$DEST/$version/Dockerfile.build" <<-EOF - RUN go build -o aagen contrib/apparmor/*.go \ + RUN GOPATH=/go go build -o aagen contrib/apparmor/*.go \ && ./aagen contrib/apparmor/docker-engine RUN ln -sfv hack/make/.build-deb debian RUN { echo '$debSource (${debVersion}-0~${suite}) $suite; urgency=low'; echo; echo ' * Version: $VERSION'; echo; echo " -- $debMaintainer $debDate"; } > debian/changelog && cat >&2 debian/changelog