Browse code
disable install of docker-engine for 1.10, try to get ready for 1.11
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Jessica Frazelle authored on 2016/01/19 06:14:54Showing 2 changed files
| ... | ... |
@@ -10,4 +10,3 @@ contrib/init/systemd/docker.socket lib/systemd/system/ |
| 10 | 10 |
contrib/mk* usr/share/docker-engine/contrib/ |
| 11 | 11 |
contrib/nuke-graph-directory.sh usr/share/docker-engine/contrib/ |
| 12 | 12 |
contrib/syntax/nano/Dockerfile.nanorc usr/share/nano/ |
| 13 |
-contrib/apparmor/docker-engine etc/apparmor.d/ |
| ... | ... |
@@ -59,8 +59,6 @@ set -e |
| 59 | 59 |
echo 'ENV DOCKER_EXPERIMENTAL 1' >> "$DEST/$version/Dockerfile.build" |
| 60 | 60 |
fi |
| 61 | 61 |
cat >> "$DEST/$version/Dockerfile.build" <<-EOF |
| 62 |
- RUN GOPATH=/go go build -o aagen contrib/apparmor/*.go \ |
|
| 63 |
- && ./aagen contrib/apparmor/docker-engine |
|
| 64 | 62 |
RUN ln -sfv hack/make/.build-deb debian |
| 65 | 63 |
RUN { echo '$debSource (${debVersion}-0~${suite}) $suite; urgency=low'; echo; echo ' * Version: $VERSION'; echo; echo " -- $debMaintainer $debDate"; } > debian/changelog && cat >&2 debian/changelog
|
| 66 | 64 |
RUN dpkg-buildpackage -uc -us |