From 4d182550b131198aa4b09df291805d88747e623a Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <jess@docker.com>
Date: Mon, 9 Feb 2015 18:03:51 -0800
Subject: [PATCH] spotify & tomahawk

---
 spotify/Dockerfile  | 17 +++++++++++++++
 tomahawk/Dockerfile | 52 +++++++--------------------------------------
 2 files changed, 25 insertions(+), 44 deletions(-)
 create mode 100644 spotify/Dockerfile

diff --git a/spotify/Dockerfile b/spotify/Dockerfile
new file mode 100644
index 0000000..ee75693
--- /dev/null
+++ b/spotify/Dockerfile
@@ -0,0 +1,17 @@
+FROM debian:jessie
+MAINTAINER Jessie Frazelle <jess@linux.com>
+
+# install wine
+# and iceweasel since we have to sign in w facebook
+# GROSS
+RUN apt-get update && apt-get install -y \
+    wine \
+    --no-install-recommends && \
+    dpkg --add-architecture i386 && \
+    apt-get update && \
+    apt-get install -y \
+    wine32
+
+COPY ./SpotifySetup.exe /usr/src/SpotifySetup.exe
+
+CMD [ "wine", "/usr/src/SpotifySetup.exe" ]
diff --git a/tomahawk/Dockerfile b/tomahawk/Dockerfile
index f535754..e539f8c 100644
--- a/tomahawk/Dockerfile
+++ b/tomahawk/Dockerfile
@@ -1,48 +1,12 @@
-FROM debian:wheezy
+FROM ubuntu:14.04
+MAINTAINER Jessie Frazelle <jess@linux.com>
 
 RUN apt-get update && apt-get install -y \
-    build-essential \
-    ca-certificates \
-    cmake \
-    curl \
-    libtag1c2a \
-    libtag1-dev \
-    libqt4-dev \
-    libqt4-sql-sqlite \
-    libphonon-dev \
-    phonon-dbg \
-    libphononexperimental4 \
-    libboost-dev \
-    libboost-thread-dev \
-    zlib1g-dev \
-    libgnutls-dev \
-    libz-dev \
-    libqjson-dev \
-    libqca2-dev \
-    libx11-dev \
-    pkg-config \
-    libqca2-plugin-ossl \
-    libidn2-0-dev \
-    speex \
-    libsamplerate0-dev \
-    libfftw3-dev \
-    libgsasl7-dev \
-    automoc \
-    pulseaudio \
-    alsa-utils \
-    --no-install-recommends
-
-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 curl -sSL https://github.com/tomahawk-player/tomahawk/archive/0.8.2.tar.gz | tar -v -C /root -xz && \
-    mv /root/tomahawk-0.8.2 /root/tomahawk/ && \
-    mkdir -p /root/tomahawk/build && cd /root/tomahawk/build && \
-    cmake .. && \
-    make && \
-    mv /root/tomahawk/tomahawk /usr/bin/
+    software-properties-common \
+    --no-install-recommends && \
+    add-apt-repository ppa:tomahawk/ppa && \
+    apt-get update && \
+    apt-get install -y \
+    tomahawk
 
 ENTRYPOINT  [ "/usr/bin/tomahawk" ]