From c4bc9657b9e52f12b37aa36da15c1a2eb86519a3 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Mon, 18 Jan 2016 13:14:54 -0800 Subject: [PATCH] disable install of docker-engine for 1.10, try to get ready for 1.11 Signed-off-by: Jessica Frazelle --- hack/make/.build-deb/docker-engine.install | 1 - hack/make/build-deb | 2 -- 2 files changed, 3 deletions(-) diff --git a/hack/make/.build-deb/docker-engine.install b/hack/make/.build-deb/docker-engine.install index 8e0739e217..dc6b25f04f 100644 --- a/hack/make/.build-deb/docker-engine.install +++ b/hack/make/.build-deb/docker-engine.install @@ -10,4 +10,3 @@ contrib/init/systemd/docker.socket lib/systemd/system/ contrib/mk* usr/share/docker-engine/contrib/ contrib/nuke-graph-directory.sh usr/share/docker-engine/contrib/ contrib/syntax/nano/Dockerfile.nanorc usr/share/nano/ -contrib/apparmor/docker-engine etc/apparmor.d/ diff --git a/hack/make/build-deb b/hack/make/build-deb index b8fd7b3585..d9e44d23f6 100644 --- a/hack/make/build-deb +++ b/hack/make/build-deb @@ -59,8 +59,6 @@ set -e echo 'ENV DOCKER_EXPERIMENTAL 1' >> "$DEST/$version/Dockerfile.build" fi cat >> "$DEST/$version/Dockerfile.build" <<-EOF - 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 RUN dpkg-buildpackage -uc -us