Skip to content

Commit

Permalink
cleanup flash
Browse files Browse the repository at this point in the history
Signed-off-by: Jessica Frazelle <[email protected]>
  • Loading branch information
jessfraz committed Jun 6, 2015
1 parent c135833 commit 4692ed1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
6 changes: 1 addition & 5 deletions chrome/beta/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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/*

Expand Down
6 changes: 1 addition & 5 deletions chrome/stable/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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/*

Expand Down
10 changes: 6 additions & 4 deletions chromium/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,19 @@
# -e DISPLAY=unix$DISPLAY chromium

# Base docker image
FROM debian:jessie
FROM debian:sid
MAINTAINER Jessica Frazelle <[email protected]>

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 \
Expand All @@ -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" ]
Binary file modified chromium/google-talkplugin_current_amd64.deb
Binary file not shown.

0 comments on commit 4692ed1

Please sign in to comment.