From 0ab8c322be993d50cf29cc986cad674206f5c135 Mon Sep 17 00:00:00 2001
From: Jess Frazelle <jess@mesosphere.com>
Date: Tue, 5 Apr 2016 13:54:36 -0700
Subject: [PATCH] updates

Signed-off-by: Jess Frazelle <jess@mesosphere.com>
---
 firefox/Dockerfile | 18 ++++--------------
 spotify/Dockerfile | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/firefox/Dockerfile b/firefox/Dockerfile
index 08a0cd3..767754e 100644
--- a/firefox/Dockerfile
+++ b/firefox/Dockerfile
@@ -1,30 +1,20 @@
 FROM debian:sid
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
-RUN sed -i.bak 's/sid main/sid main contrib/g' /etc/apt/sources.list && \
-	apt-get update && apt-get install -y \
-	bzip2 \
+RUN	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0AB215679C571D1C8325275B9BDB3D89CE49EC21 \
+	&& echo "deb http://ppa.launchpad.net/mozillateam/firefox-next/ubuntu wily main" >> /etc/apt/sources.list.d/firefox.list \
+	&& apt-get update && apt-get install -y \
 	ca-certificates \
-	curl \
-	flashplugin-nonfree \
+	firefox \
 	hicolor-icon-theme \
 	libasound2 \
-	libdbus-glib-1-2 \
 	libgl1-mesa-dri \
 	libgl1-mesa-glx \
-	libcanberra-gtk-module \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV FIREFOX_VERSION 45.0.1
 ENV LANG en-US
 
-RUN curl -sSL "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/${LANG}/firefox-${FIREFOX_VERSION}.tar.bz2" -o /tmp/firefox.tar.bz2 \
-	&& mkdir -p /opt/firefox \
-	&& tar -xjf /tmp/firefox.tar.bz2 -C /opt/firefox --strip-components 1 \
-	&& rm /tmp/firefox.tar.bz2* \
-	&& ln -s /opt/firefox/firefox /usr/bin/firefox
-
 COPY local.conf /etc/fonts/local.conf
 
 ENTRYPOINT [ "/usr/bin/firefox" ]
diff --git a/spotify/Dockerfile b/spotify/Dockerfile
index 1510aea..aa71c6f 100644
--- a/spotify/Dockerfile
+++ b/spotify/Dockerfile
@@ -10,21 +10,21 @@
 #	--name spotify \
 #	jess/spotify
 #
-FROM ubuntu:14.04
+FROM debian:sid
 MAINTAINER Jessie Frazelle <jess@linux.com>
 
-RUN apt-get update && apt-get install -y \
-	alsa-utils \
-	libpangoxft-1.0-0 \
-	xdg-utils \
-	software-properties-common \
-	--no-install-recommends \
-	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BBEBDCB318AD50EC6865090613B00F1FD2C19886 \
+RUN	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BBEBDCB318AD50EC6865090613B00F1FD2C19886 \
 	&& echo "deb http://repository.spotify.com stable non-free" >> /etc/apt/sources.list.d/spotify.list \
-	&& apt-get update \
-	&& apt-get install --force-yes -y \
+	&& apt-get update && apt-get install -y \
+	alsa-utils \
+	libgl1-mesa-dri \
+	libgl1-mesa-glx \
+	libpangoxft-1.0-0 \
+	libssl1.0.0 \
+	libxss1 \
 	spotify-client \
-	&& apt-get purge --auto-remove -y software-properties-common \
+	xdg-utils \
+	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 ENV HOME /home/spotify