cleanup flash

Signed-off-by: Jessica Frazelle <princess@docker.com>

chrome/beta/Dockerfile

@@ -7,8 +7,7 @@ COPY google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.de
 ADD  https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb /src/google-chrome-beta_current_amd64.deb
 
 # Install Chromium
-RUN sed -i.bak 's/sid main/sid main contrib non-free/g' /etc/apt/sources.list && \
-	mkdir -p /usr/share/icons/hicolor && \
+RUN mkdir -p /usr/share/icons/hicolor && \
 	apt-get update && apt-get install -y \
 	ca-certificates \
 	gconf-service \
@@ -31,9 +30,6 @@ RUN sed -i.bak 's/sid main/sid main contrib non-free/g' /etc/apt/sources.list &&
 	xdg-utils \
 	--no-install-recommends && \
 	dpkg -i '/src/google-chrome-beta_current_amd64.deb' && \
-	apt-get install -y \
-	pepperflashplugin-nonfree \
-	--no-install-recommends && \
 	dpkg -i '/src/google-talkplugin_current_amd64.deb' \
 	&& rm -rf /var/lib/apt/lists/*
 

chrome/stable/Dockerfile

@@ -7,8 +7,7 @@ COPY google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.de
 ADD  https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb /src/google-chrome-stable_current_amd64.deb
 
 # Install Chromium
-RUN sed -i.bak 's/sid main/sid main contrib non-free/g' /etc/apt/sources.list && \
-	mkdir -p /usr/share/icons/hicolor && \
+RUN mkdir -p /usr/share/icons/hicolor && \
 	apt-get update && apt-get install -y \
 	ca-certificates \
 	gconf-service \
@@ -31,9 +30,6 @@ RUN sed -i.bak 's/sid main/sid main contrib non-free/g' /etc/apt/sources.list &&
 	xdg-utils \
 	--no-install-recommends && \
 	dpkg -i '/src/google-chrome-stable_current_amd64.deb' && \
-	apt-get install -y \
-	pepperflashplugin-nonfree \
-	--no-install-recommends && \
 	dpkg -i '/src/google-talkplugin_current_amd64.deb' \
 	&& rm -rf /var/lib/apt/lists/*
 

chromium/Dockerfile

@@ -21,17 +21,19 @@
 #		-e DISPLAY=unix$DISPLAY chromium
 
 # Base docker image
-FROM debian:jessie
+FROM debian:sid
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 COPY google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.deb
 # Install Chromium
-RUN sed -i.bak 's/jessie main/jessie main contrib non-free/g' /etc/apt/sources.list && \
+RUN sed -i.bak 's/sid main/sid main contrib non-free/g' /etc/apt/sources.list && \
 	apt-get update && apt-get install -y \
 	chromium \
 	chromium-l10n \
 	libcanberra-gtk-module \
 	libexif-dev \
+	libgl1-mesa-dri \
+	libgl1-mesa-glx \
 	libpango1.0-0 \
 	libv4l-0 \
 	pepperflashplugin-nonfree \
@@ -40,5 +42,5 @@ RUN sed -i.bak 's/jessie main/jessie main contrib non-free/g' /etc/apt/sources.l
 	/bin/echo -e 'export GOOGLE_API_KEY="AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k"\nexport GOOGLE_DEFAULT_CLIENT_ID="811574891467.apps.googleusercontent.com"\nexport GOOGLE_DEFAULT_CLIENT_SECRET="kdloedMFGdGla2P1zacGjAQh"' > /etc/chromium.d/googleapikeys && \
 	dpkg -i '/src/google-talkplugin_current_amd64.deb'
 
-# Autorun x11vnc
-CMD ["/usr/bin/chromium", "--no-sandbox", "--user-data-dir=/data"]
+ENTRYPOINT [ "/usr/bin/chromium" ]
+CMD [ "--user-data-dir=/data", "--no-sandbox" ]