From 31f2da120e8b3ad06a49fc11b0745aa77e37e9ac Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@google.com>
Date: Fri, 9 Jun 2017 14:00:18 -0400
Subject: [PATCH] updates and cleanup

Signed-off-by: Jess Frazelle <acidburn@google.com>
---
 afterthedeadline/Dockerfile |  1 +
 slack/Dockerfile            | 42 +++++++++++--------------------------
 sublime-text-3/Dockerfile   |  1 -
 sublime-text-3/run.sh       |  8 ++++---
 4 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/afterthedeadline/Dockerfile b/afterthedeadline/Dockerfile
index 91bb961..5f71f9e 100644
--- a/afterthedeadline/Dockerfile
+++ b/afterthedeadline/Dockerfile
@@ -7,6 +7,7 @@ RUN apk add --no-cache \
 	tar
 
 ENV LANG C.UTF-8
+# https://open.afterthedeadline.com/download/download-source-code/
 ENV ATD_VERSION 081310
 
 RUN curl -sSL "http://www.polishmywriting.com/download/atd_distribution${ATD_VERSION}.tgz" -o /tmp/atd.tar.gz \
diff --git a/slack/Dockerfile b/slack/Dockerfile
index acd8bb8..b77e9d2 100644
--- a/slack/Dockerfile
+++ b/slack/Dockerfile
@@ -14,7 +14,7 @@
 #	--name slack \
 #	jess/slack "$@"
 
-FROM debian:stretch
+FROM debian:jessie
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 ENV LC_ALL en_US.UTF-8
@@ -23,24 +23,9 @@ ENV LANG en_US.UTF-8
 RUN apt-get update && apt-get install -y \
 	apt-transport-https \
 	ca-certificates \
-	gconf2 \
-	gconf-service \
-	gir1.2-gnomekeyring-1.0 \
-	gvfs-bin \
-	hunspell-en-us \
-	libappindicator1 \
-	libasound2 \
-	libgl1-mesa-dri \
-	libgl1-mesa-glx \
-	libgnome-keyring0 \
-	libgtk2.0-0 \
-	libnotify4 \
-	libnss3 \
-	libxss1 \
-	libxtst6 \
+	curl \
+	gnupg \
 	locales \
-	python \
-	xdg-utils \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
@@ -48,18 +33,15 @@ RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
 	&& locale-gen en_US.utf8 \
 	&& /usr/sbin/update-locale LANG=en_US.UTF-8
 
-ENV SLACK_VERSION 2.1.1
+# Add the slack debian repo
+RUN curl -sSL https://packagecloud.io/slacktechnologies/slack/gpgkey | apt-key add -
+RUN echo "deb https://packagecloud.io/slacktechnologies/slack/debian/ jessie main" > /etc/apt/sources.list.d/slacktechnologies_slack.list
 
-# download the deb and node
-RUN buildDeps=' \
-		curl \
-	' \
-	&& set -x \
-	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& curl -sSL "https://downloads.slack-edge.com/linux_releases/slack-desktop-${SLACK_VERSION}-amd64.deb" > /tmp/slack-desktop.deb \
-	&& dpkg -i /tmp/slack-desktop.deb \
-	&& rm -rf /tmp/slack-desktop.deb \
-	&& apt-get purge -y --auto-remove $buildDeps
+RUN apt-get update && apt-get -y install \
+	libasound2 \
+	libx11-xcb1 \
+	slack-desktop \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT ["/usr/lib/slack/slack"]
diff --git a/sublime-text-3/Dockerfile b/sublime-text-3/Dockerfile
index ece1afa..41636da 100644
--- a/sublime-text-3/Dockerfile
+++ b/sublime-text-3/Dockerfile
@@ -52,7 +52,6 @@ RUN apt-get update && apt-get -y install \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
-
 # In order to prevent writing as root:root in Sublime, we have to run the Sublime Text container
 # as the user that creates the container. Normally we do this by passing $UID.
 # But just passing $UID along isn't enough - Sublime has to be started by a user that exists.
diff --git a/sublime-text-3/run.sh b/sublime-text-3/run.sh
index 723f321..2fa048a 100644
--- a/sublime-text-3/run.sh
+++ b/sublime-text-3/run.sh
@@ -2,11 +2,13 @@
 set -e
 set -o pipefail
 
+COMMAND=/opt/sublime_text/sublime_text
+
 if [ -z ${NEWUSER+x} ]; then
 	echo 'WARN: No user was defined, defaulting to root.'
 	echo 'WARN: Sublime will save files as root:root.'
 	echo '      To prevent this, start the container with -e NEWUSER=$USER'
-	/usr/src/sublime_text/sublime_text -w
+	exec $COMMAND -w
 else
 	# The root user already exists, so we only need to do something if
 	# a user has been specified.
@@ -14,6 +16,6 @@ else
 	# If you'd like to have Sublime Text add your development folder
 	# to the current project (i.e. in the sidebar at start), append
 	# "-a /home/$NEWUSER/Documents" (without quotes) into the su -c command below.
-	# Example: su $NEWUSER -c "/usr/src/sublime_text/sublime_text -w -a /home/$NEWUSER/Documents"
-	su $NEWUSER -c "/usr/src/sublime_text/sublime_text -w"
+	# Example: su $NEWUSER -c "$COMMAND -w -a /home/$NEWUSER/Documents"
+	su $NEWUSER -c "$COMMAND -w"
 fi