From 96a59321e924fdef9049da82b4607206e21852aa Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@microsoft.com>
Date: Sat, 14 Jul 2018 21:34:56 -0400
Subject: [PATCH] add browsh

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
---
 browsh/Dockerfile | 56 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/browsh/Dockerfile b/browsh/Dockerfile
index 0162226..4fc34bb 100644
--- a/browsh/Dockerfile
+++ b/browsh/Dockerfile
@@ -1,27 +1,49 @@
-FROM alpine:latest
+FROM debian:buster-slim
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
-# Install bash so we have it.
-RUN apk add --no-cache \
-		bash
+# Install bash and other deps so we have them.
+RUN apt-get update && apt-get install -y \
+		bash \
+		bzip2 \
+		ca-certificates \
+		libdbus-glib-1-2 \
+		libgtk-3-0 \
+		libx11-xcb1 \
+		libxt6 \
+		tar \
+		wget \
+		--no-install-recommends \
+		&& rm -rf /var/lib/apt/lists/*
+
+RUN wget "https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-gambling-porn-social/hosts" -O /etc/hosts
+
+# Create user and change ownership
+RUN addgroup --gid 666 browsh \
+	&& adduser --uid 666 --home /home/browsh --ingroup browsh browsh
+
+WORKDIR /home/browsh
+USER browsh
+
+RUN mkdir -p /home/browsh/bin
+
+ENV PATH="/bin:/usr/bin:/usr/local/bin:/home/browsh/bin:${PATH}"
 
 # Install firefox.
-RUN apk add --no-cache \
-		firefox \
-		--repository https://dl-4.alpinelinux.org/alpine/edge/testing \
+ENV FIREFOX_VERSION 60.0
+RUN set -x \
+	&& wget "https://ftp.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/firefox-${FIREFOX_VERSION}.tar.bz2" -O /tmp/firefox.tar.bz2 \
+	&& ( \
+		cd /tmp \
+		&& bzip2 -d /tmp/firefox.tar.bz2 \
+		&& tar -xf /tmp/firefox.tar -C /home/browsh/bin/ --strip-components 1 \
+	) \
+	&& rm -rf /tmp/firefox* \
 	&& firefox --version
 
 # Install browsh.
 ENV BROWSH_VERSION 1.3.3
-RUN wget "https://github.com/browsh-org/browsh/releases/download/v${BROWSH_VERSION}/browsh_${BROWSH_VERSION}_linux_amd64" -O /usr/local/bin/browsh \
-	&& chmod a+x /usr/local/bin/browsh
-
-# Create user and change ownership
-RUN addgroup -g 666 -S browsh \
-	&& adduser -u 666 -SHG browsh browsh
-
-#WORKDIR /home/browsh
-#USER browsh
+RUN wget "https://github.com/browsh-org/browsh/releases/download/v${BROWSH_VERSION}/browsh_${BROWSH_VERSION}_linux_amd64" -O /home/browsh/bin/browsh \
+	&& chmod a+x /home/browsh/bin/browsh
 
 # Firefox behaves quite differently to normal on its first run, so by getting
 # that over and done with here when there's no user to be dissapointed means
@@ -30,4 +52,4 @@ RUN TERM=xterm browsh & \
 		pidsave=$!; \
 		sleep 10; kill $pidsave || true;
 
-ENTRYPOINT [ "/usr/local/bin/browsh" ]
+ENTRYPOINT [ "browsh" ]