From 255a334f1d552f83e50a16671b5dca2f6eab01ba Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <acidburn@docker.com>
Date: Thu, 24 Sep 2015 18:04:41 -0700
Subject: [PATCH] add slack

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
---
 scudcloud/Dockerfile    | 38 +++++++++++++++++++++++++++++++++
 slack/Dockerfile        | 47 ++++++++++++++++++++++++-----------------
 spotify-wine/Dockerfile |  2 +-
 watchman/Dockerfile     | 28 ++++++++++++++++++++++++
 4 files changed, 95 insertions(+), 20 deletions(-)
 create mode 100644 scudcloud/Dockerfile
 create mode 100644 watchman/Dockerfile

diff --git a/scudcloud/Dockerfile b/scudcloud/Dockerfile
new file mode 100644
index 0000000..d2ce483
--- /dev/null
+++ b/scudcloud/Dockerfile
@@ -0,0 +1,38 @@
+# To use:
+# Needs X11 socket and dbus mounted
+#
+# docker run --rm -it \
+#	-v /etc/machine-id:/etc/machine-id:ro \
+#	-v /etc/localtime:/etc/localtime:ro \
+#	-v /tmp/.X11-unix:/tmp/.X11-unix \
+#	-e DISPLAY=unix$DISPLAY \
+#	--device /dev/snd:/dev/snd \
+#	-v /var/run/dbus:/var/run/dbus \
+#	-v $HOME/.scudcloud:/home/user/.config/scudcloud \
+#	--name scudcloud \
+#	jess/scudcloud
+
+FROM ubuntu:14.04
+MAINTAINER Jessie Frazelle <jess@linux.com>
+
+RUN apt-get update && apt-get install -y \
+	dbus-x11 \
+	hunspell-en-us \
+	libnotify-bin \
+	python3-dbus \
+	software-properties-common \
+	--no-install-recommends && \
+	apt-add-repository -y ppa:rael-gc/scudcloud && \
+	apt-get update && \
+	apt-get install -y \
+	scudcloud \
+	&& rm -rf /var/lib/apt/lists/*
+
+ENV LANG en_US.UTF-8
+ENV HOME /home/user
+RUN useradd --create-home --home-dir $HOME user \
+	&& chown -R user:user $HOME
+
+USER user
+
+ENTRYPOINT ["/usr/bin/scudcloud"]
diff --git a/slack/Dockerfile b/slack/Dockerfile
index 6933712..d3a8a9b 100644
--- a/slack/Dockerfile
+++ b/slack/Dockerfile
@@ -1,33 +1,42 @@
-# To use:
-# Needs X11 socket and dbus mounted
-# 
+# Run slack desktop app in a container
+#
 # docker run --rm -it \
-#	-v /etc/machine-id:/etc/machine-id:ro \
 #	-v /etc/localtime:/etc/localtime:ro \
 #	-v /tmp/.X11-unix:/tmp/.X11-unix \
 #	-e DISPLAY=unix$DISPLAY \
 #	--device /dev/snd:/dev/snd \
-#	-v /var/run/dbus:/var/run/dbus \
-#	-v $HOME/.scudcloud:/home/user/.config/scudcloud \
 #	--name slack \
 #	jess/slack
 
-FROM ubuntu:14.04
+FROM debian:sid
 MAINTAINER Jessie Frazelle <jess@linux.com>
 
 RUN apt-get update && apt-get install -y \
-	dbus-x11 \
-	hunspell-en-us \
-	libnotify-bin \
-	python3-dbus \
-	software-properties-common \
-	--no-install-recommends && \
-	apt-add-repository -y ppa:rael-gc/scudcloud && \
-	apt-get update && \
-	apt-get install -y \
-	scudcloud \
-	&& rm -rf /var/lib/apt/lists/*
+	apt-transport-https \
+	ca-certificates \
+	curl \
+	gconf2 \
+	gconf-service \
+	gvfs-bin \
+	libasound2 \
+	libgtk2.0-0 \
+	libnotify4 \
+	libnss3 \
+	libxss1 \
+	libxtst6 \
+	locales \
+	python-minimal \
+	xdg-utils \
+	--no-install-recommends \
+	&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
+	&& locale-gen en_US.utf8 \
+	&& /usr/sbin/update-locale LANG=en_US.UTF-8 \
+	&& curl -sSL https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-1.2.2-amd64.deb > /tmp/slack-desktop.deb \
+	&& dpkg -i /tmp/slack-desktop.deb \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /tmp/slack-desktop.deb
 
+ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV HOME /home/user
 RUN useradd --create-home --home-dir $HOME user \
@@ -35,4 +44,4 @@ RUN useradd --create-home --home-dir $HOME user \
 
 USER user
 
-ENTRYPOINT ["/usr/bin/scudcloud"]
+ENTRYPOINT ["slack"]
diff --git a/spotify-wine/Dockerfile b/spotify-wine/Dockerfile
index c98cdf4..31fcdd8 100644
--- a/spotify-wine/Dockerfile
+++ b/spotify-wine/Dockerfile
@@ -12,7 +12,7 @@
 FROM jess/wine
 MAINTAINER Jessie Frazelle <jess@linux.com>
 
-COPY SpotifySetup.exe /usr/src/SpotifySetup.exe
+ADD https://d1clcicqv97n4s.cloudfront.net/ctrl/SpotifySetup.exe /usr/src/SpotifySetup.exe
 
 RUN echo "wine /usr/src/SpotifySetup.exe" > /root/.bash_history
 
diff --git a/watchman/Dockerfile b/watchman/Dockerfile
new file mode 100644
index 0000000..ad8d5fc
--- /dev/null
+++ b/watchman/Dockerfile
@@ -0,0 +1,28 @@
+FROM debian:sid
+MAINTAINER Jessica Frazelle <jess@docker.com>
+
+RUN apt-get update && apt-get install -y \
+	ca-certificates \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
+
+RUN buildDeps=' \
+		autoconf \
+		automake \
+		clang \
+		git \
+		make \
+	' \
+	&& set -x \
+	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& git clone https://github.com/facebook/watchman.git /usr/src/watchman \
+	&& cd /usr/src/watchman \
+	&& ./autogen.sh \
+	&& ./configure \
+	&& make \
+	&& make install \
+	&& rm -rf /usr/src/watchmen \
+	&& apt-get purge -y --auto-remove $buildDeps
+
+ENTRYPOINT [ "watchman" ]