xZero707/dockerfiles
1
0
Fork 0
mirror of https://github.com/jessfraz/dockerfiles.git synced 2024-11-27 04:16:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup flash

Browse Source 
Signed-off-by: Jessica Frazelle <princess@docker.com>
This commit is contained in:
Jessica Frazelle 2015-06-05 18:10:14 -07:00
parent c7b365c6d6
commit f85a0a6963
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chrome/beta/Dockerfile
View File

@ -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 ADD https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb /src/google-chrome-beta_current_amd64.deb
# Install Chromium # Install Chromium
RUN sed -i.bak 's/sid main/sid main contrib non-free/g' /etc/apt/sources.list && \ RUN mkdir -p /usr/share/icons/hicolor && \
mkdir -p /usr/share/icons/hicolor && \
apt-get update && apt-get install -y \ apt-get update && apt-get install -y \
ca-certificates \ ca-certificates \
gconf-service \ 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 \ xdg-utils \
--no-install-recommends && \ --no-install-recommends && \
dpkg -i '/src/google-chrome-beta_current_amd64.deb' && \ 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' \ dpkg -i '/src/google-talkplugin_current_amd64.deb' \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

6
chrome/stable/Dockerfile
View File

@ -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 ADD https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb /src/google-chrome-stable_current_amd64.deb
# Install Chromium # Install Chromium
RUN sed -i.bak 's/sid main/sid main contrib non-free/g' /etc/apt/sources.list && \ RUN mkdir -p /usr/share/icons/hicolor && \
mkdir -p /usr/share/icons/hicolor && \
apt-get update && apt-get install -y \ apt-get update && apt-get install -y \
ca-certificates \ ca-certificates \
gconf-service \ 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 \ xdg-utils \
--no-install-recommends && \ --no-install-recommends && \
dpkg -i '/src/google-chrome-stable_current_amd64.deb' && \ 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' \ dpkg -i '/src/google-talkplugin_current_amd64.deb' \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

10
chromium/Dockerfile
View File

@ -21,17 +21,19 @@
# -e DISPLAY=unix$DISPLAY chromium # -e DISPLAY=unix$DISPLAY chromium
# Base docker image # Base docker image
FROM debian:jessie FROM debian:sid
MAINTAINER Jessica Frazelle <jess@docker.com> MAINTAINER Jessica Frazelle <jess@docker.com>
COPY google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.deb COPY google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.deb
# Install Chromium # 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 \ apt-get update && apt-get install -y \
chromium \ chromium \
chromium-l10n \ chromium-l10n \
libcanberra-gtk-module \ libcanberra-gtk-module \
libexif-dev \ libexif-dev \
libgl1-mesa-dri \
libgl1-mesa-glx \
libpango1.0-0 \ libpango1.0-0 \
libv4l-0 \ libv4l-0 \
pepperflashplugin-nonfree \ 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 && \ /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' dpkg -i '/src/google-talkplugin_current_amd64.deb'
# Autorun x11vnc ENTRYPOINT [ "/usr/bin/chromium" ]
CMD ["/usr/bin/chromium", "--no-sandbox", "--user-data-dir=/data"] CMD [ "--user-data-dir=/data", "--no-sandbox" ]