updates

tomahawk/Dockerfile

@@ -1,41 +1,48 @@
-FROM debian:jessie
+FROM debian:wheezy
 
-RUN	apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y \
-  build-essential \
+    build-essential \
-	cmake \
+    ca-certificates \
-	libtag1c2a \
+    cmake \
-	libtag1-dev \
+    curl \
-	libqt4-dev \
+    libtag1c2a \
-	libqt4-sql-sqlite \
+    libtag1-dev \
-	libphonon-dev \
+    libqt4-dev \
-	libboost-dev \
+    libqt4-sql-sqlite \
-	libboost-thread-dev \
+    libphonon-dev \
-	zlib1g-dev \
+    phonon-dbg \
-	libgnutls-dev \
+    libphononexperimental4 \
-	libz-dev \
+    libboost-dev \
-	libqjson-dev \
+    libboost-thread-dev \
-	libqca2-dev \
+    zlib1g-dev \
-	libx11-dev \
+    libgnutls-dev \
-	pkg-config \
+    libz-dev \
-	libqca2-plugin-ossl \
+    libqjson-dev \
-	libidn2-0-dev \
+    libqca2-dev \
-	speex \
+    libx11-dev \
-	libsamplerate0-dev \
+    pkg-config \
-	libfftw3-dev \
+    libqca2-plugin-ossl \
-	libgsasl7-dev \
+    libidn2-0-dev \
-	--no-install-recommends
+    speex \
+    libsamplerate0-dev \
+    libfftw3-dev \
+    libgsasl7-dev \
+    automoc \
+    pulseaudio \
+    alsa-utils \
+    --no-install-recommends
 
-ADD	ftp://ftp.kde.org/pub/kde/stable/attica/attica-0.4.1.tar.bz2 /root/attica
+RUN curl -sSL http://download.kde.org/stable/attica/attica-0.4.1.tar.bz2 | tar -v -C /root -xj && \
+    mv /root/attica-0.4.1 /root/attica && \
+    mkdir -p /root/attica/build && cd /root/attica/build && \
+    cmake .. && \
+    make && make install
 
-RUN	mkdir /root/attica/build && cd /root/attica/build && \
+RUN curl -sSL https://github.com/tomahawk-player/tomahawk/archive/0.8.2.tar.gz | tar -v -C /root -xz && \
-	cmake .. && \
+    mv /root/tomahawk-0.8.2 /root/tomahawk/ && \
-	make && make install
+    mkdir -p /root/tomahawk/build && cd /root/tomahawk/build && \
+    cmake .. && \
+    make && \
+    mv /root/tomahawk/tomahawk /usr/bin/
 
-ADD	https://github.com/tomahawk-player/tomahawk.git /root/tomahawk
+ENTRYPOINT  [ "/usr/bin/tomahawk" ]
-
-RUN	mkdir /root/tomahawk/build && cd /root/tomahawk/build && \
-	cmake .. && \
-	make && \
-	mv /root/tomahawk/tomahawk /usr/bin/
-
-ENTRYPOINT [ "/usr/bin/tomahawk" ]