From d4974859909d22c8385f729a98b65db4019ff59c Mon Sep 17 00:00:00 2001
From: Jess Frazelle <me@jessfraz.com>
Date: Wed, 8 Jun 2016 18:21:28 -0700
Subject: [PATCH] cleanup

Signed-off-by: Jess Frazelle <me@jessfraz.com>
---
 kubes-dev/Dockerfile    | 74 -----------------------------------------
 slack/Dockerfile        | 19 ++++++++---
 spotify-wine/Dockerfile |  2 +-
 3 files changed, 15 insertions(+), 80 deletions(-)
 delete mode 100644 kubes-dev/Dockerfile

diff --git a/kubes-dev/Dockerfile b/kubes-dev/Dockerfile
deleted file mode 100644
index d7dd7f8..0000000
--- a/kubes-dev/Dockerfile
+++ /dev/null
@@ -1,74 +0,0 @@
-FROM debian:jessie
-
-# Packaged dependencies
-RUN apt-get update && apt-get install -y \
-	autoconf \
-	automake \
-	ca-certificates \
-	curl \
-	g++ \
-	git \
-	libtool \
-	make \
-	python \
-	python-pip \
-	rsync \
-	unzip \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
-
-RUN pip install -U \
-	argparse
-
-# Install Go
-ENV GO_VERSION 1.6.2
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \
-	| tar -xzC /usr/local
-ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go:/go/src/k8s.io/kubernetes/Godeps/_workspace
-
-# Install google/protobuf
-ENV PROTOBUF_VERSION v3.0.0-beta-2
-RUN set -x \
-	&& export PROTOBUF_PATH="$(mktemp -d)" \
-	&& curl -fsSL "https://github.com/google/protobuf/archive/${PROTOBUF_VERSION}.tar.gz" \
-		| tar -xzC "$PROTOBUF_PATH" --strip-components=1 \
-	&& ( \
-		cd "$PROTOBUF_PATH" \
-		&& ./autogen.sh \
-		&& ./configure --prefix=/usr/local \
-		&& make \
-		&& make install \
-		&& ldconfig \
-	) \
-	&& rm -rf "$PROTOBUFPATH"
-
-ENV DOCKER_BUCKET get.docker.com
-ENV DOCKER_VERSION 1.11.0
-ENV DOCKER_SHA256 87331b3b75d32d3de5d507db9a19a24dd30ff9b2eb6a5a9bdfaba954da15e16b
-
-RUN set -x \
-	&& curl -fSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-$DOCKER_VERSION.tgz" -o docker.tgz \
-	&& echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - \
-	&& tar -xzvf docker.tgz \
-	&& mv docker/* /usr/local/bin/ \
-	&& rmdir docker \
-	&& rm docker.tgz \
-	&& docker -v
-
-ENV DOWNLOAD_ETCD_VERSION 2.3.3
-RUN curl -sSL https://github.com/coreos/etcd/releases/download/v${DOWNLOAD_ETCD_VERSION}/etcd-v${DOWNLOAD_ETCD_VERSION}-linux-amd64.tar.gz -o /tmp/etcd.tar.gz \
-	&& mkdir -p /tmp/etcd \
-	&& ( \
-	cd /tmp \
-	&& tar -xv --strip-components 1 -f etcd.tar.gz -C /tmp/etcd \
-	&& mv /tmp/etcd/etcd* /usr/local/bin \
-	) \
-	&& rm -rf /tmp/etcd*
-
-RUN go get github.com/golang/protobuf/proto \
-	&& go get github.com/golang/protobuf/protoc-gen-go \
-	&& go get github.com/golang/lint/golint \
-	&& go get github.com/tools/godep
-
-WORKDIR /go/src/k8s.io/kubernetes
diff --git a/slack/Dockerfile b/slack/Dockerfile
index 4f95815..63c5511 100644
--- a/slack/Dockerfile
+++ b/slack/Dockerfile
@@ -18,12 +18,13 @@ ENV LANG en_US.UTF-8
 RUN apt-get update && apt-get install -y \
 	apt-transport-https \
 	ca-certificates \
-	curl \
 	gconf2 \
 	gconf-service \
 	gvfs-bin \
 	hunspell-en-us \
 	libasound2 \
+	libgl1-mesa-dri \
+	libgl1-mesa-glx \
 	libgtk2.0-0 \
 	libnotify4 \
 	libnss3 \
@@ -39,10 +40,18 @@ 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.0.3
+ENV SLACK_VERSION 2.0.6
 
-RUN curl -sSL "https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-${SLACK_VERSION}-amd64.deb" > /tmp/slack-desktop.deb \
+# 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
+	&& rm -rf /tmp/slack-desktop.deb \
+	&& apt-get purge -y --auto-remove $buildDeps
 
-ENTRYPOINT ["slack"]
+ENTRYPOINT ["/usr/lib/slack/slack"]
diff --git a/spotify-wine/Dockerfile b/spotify-wine/Dockerfile
index 31fcdd8..94c750c 100644
--- a/spotify-wine/Dockerfile
+++ b/spotify-wine/Dockerfile
@@ -9,7 +9,7 @@
 #	--name spotify-wine \
 #	jess/spotify-wine bash
 #
-FROM jess/wine
+FROM r.j3ss.co/wine
 MAINTAINER Jessie Frazelle <jess@linux.com>
 
 ADD https://d1clcicqv97n4s.cloudfront.net/ctrl/SpotifySetup.exe /usr/src/SpotifySetup.exe