kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #19423 from jfrazelle/apparmor-no-install 

disable install of docker-engine for 1.10, try to get ready for 1.11
This commit is contained in:
Tibor Vass 2016-01-21 12:08:50 -05:00
parent aed5691644 c4bc9657b9
commit 7d19ca7c40
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/make/.build-deb/docker-engine.install
View File

@ -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/

2
hack/make/build-deb
View File

@ -64,8 +64,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