# HG changeset patch
# User Chris Cannam
# Date 1428936122 -3600
# Node ID 57fdb9874bcbb1e852908d30507e8bb87cfdf262
# Parent  9d2d99ae7b57d72708a239953d7629a0fe5309ef# Parent  56cf3c9982a1366a8bd8dd3f90a26bfe0d166a5a
Merge

diff -r 56cf3c9982a1 -r 57fdb9874bcb deploy/linux/docker/32/Dockerfile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/linux/docker/32/Dockerfile	Mon Apr 13 15:42:02 2015 +0100
@@ -0,0 +1,24 @@
+FROM 32bit/ubuntu:14.04
+MAINTAINER Chris Cannam <cannam@all-day-breakfast.com>
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    mercurial \
+    qtbase5-dev qt5-default \
+    libsndfile1-dev libsamplerate0-dev \
+    libfftw3-dev \
+    libbz2-dev \
+    libjack-dev libjack0 libpulse-dev \
+    libmad0-dev libid3tag0-dev \
+    liboggz2-dev libfishsound1-dev \
+    libasound2-dev \
+    liblo-dev liblrdf0-dev libsord-dev libserd-dev \
+    vamp-plugin-sdk librubberband-dev \
+    libboost-dev libboost-test-dev \
+    lintian \
+    w3m
+RUN hg clone -u v1.0-linuxbuild https://code.soundsoftware.ac.uk/hg/tony /opt/tony
+WORKDIR /opt/tony
+RUN ./configure && make
+RUN make -C chp -f Makefile.linux
+RUN make -C pyin -f Makefile.linux64
+RUN bash deploy/linux/deploy-deb.sh 1.0cc1-1 i386
diff -r 56cf3c9982a1 -r 57fdb9874bcb deploy/linux/docker/64/Dockerfile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/linux/docker/64/Dockerfile	Mon Apr 13 15:42:02 2015 +0100
@@ -0,0 +1,24 @@
+FROM ubuntu:14.04
+MAINTAINER Chris Cannam <cannam@all-day-breakfast.com>
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    mercurial \
+    qtbase5-dev qt5-default \
+    libsndfile1-dev libsamplerate0-dev \
+    libfftw3-dev \
+    libbz2-dev \
+    libjack-dev libjack0 libpulse-dev \
+    libmad0-dev libid3tag0-dev \
+    liboggz2-dev libfishsound1-dev \
+    libasound2-dev \
+    liblo-dev liblrdf0-dev libsord-dev libserd-dev \
+    vamp-plugin-sdk librubberband-dev \
+    libboost-dev libboost-test-dev \
+    lintian \
+    w3m
+RUN hg clone -u v1.0-linuxbuild https://code.soundsoftware.ac.uk/hg/tony /opt/tony
+WORKDIR /opt/tony
+RUN ./configure && make
+RUN make -C chp -f Makefile.linux
+RUN make -C pyin -f Makefile.linux64
+RUN bash deploy/linux/deploy-deb.sh 1.0cc1-1 amd64
diff -r 56cf3c9982a1 -r 57fdb9874bcb deploy/linux/docker/Dockerfile
--- a/deploy/linux/docker/Dockerfile	Mon Apr 13 13:24:13 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-FROM ubuntu:14.04
-MAINTAINER Chris Cannam <cannam@all-day-breakfast.com>
-RUN apt-get update
-RUN apt-get install -y build-essential
-RUN apt-get install -y mercurial
-RUN apt-get install -y qtbase5-dev qt5-default
-RUN apt-get install -y libsndfile1-dev libsamplerate0-dev libfftw3-dev libbz2-dev libjack-dev libjack0 libpulse-dev libmad0-dev libid3tag0-dev liboggz2-dev libfishsound1-dev libasound2-dev liblo-dev liblrdf0-dev libsord-dev libserd-dev
-RUN apt-get install -y vamp-plugin-sdk librubberband-dev
-RUN apt-get install -y lintian
-RUN hg clone -u v1.0-linuxbuild https://code.soundsoftware.ac.uk/hg/tony
diff -r 56cf3c9982a1 -r 57fdb9874bcb deploy/linux/docker/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/linux/docker/README	Mon Apr 13 15:42:02 2015 +0100
@@ -0,0 +1,13 @@
+
+These Dockerfiles create images that contain .deb builds for
+Tony. That is, the entire build is run in the process of creating the
+image, and the resulting image contains the built .deb file in the
+/opt/tony directory.
+
+Run:
+
+sudo docker build -t tony:build-v1.0-amd64 64
+sudo docker build -t tony:build-v1.0-i386 32
+
+to create images ("docker images" lists them) with the builds in them.
+