update chrome

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
This commit is contained in:
Jessica Frazelle 2016-02-04 11:34:12 -08:00
parent d999505121
commit 2092777ba7
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
3 changed files with 11 additions and 8 deletions

View File

@ -1,5 +1,5 @@
# Base docker image # Base docker image
FROM debian:stretch FROM debian:jessie
MAINTAINER Jessica Frazelle <jess@docker.com> MAINTAINER Jessica Frazelle <jess@docker.com>
ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.deb ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.deb
@ -7,12 +7,11 @@ ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/
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 mkdir -p /usr/share/icons/hicolor && \ RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sources.list && \
apt-get update && apt-get install -y \ apt-get update && apt-get install -y \
ca-certificates \ ca-certificates \
fonts-liberation \ fonts-liberation \
fonts-roboto \ fonts-roboto \
fonts-symbola \
gconf-service \ gconf-service \
hicolor-icon-theme \ hicolor-icon-theme \
libappindicator1 \ libappindicator1 \
@ -35,6 +34,8 @@ RUN mkdir -p /usr/share/icons/hicolor && \
strace \ strace \
wget \ wget \
xdg-utils \ xdg-utils \
-t testing \
fonts-symbola \
--no-install-recommends && \ --no-install-recommends && \
dpkg -i '/src/google-chrome-beta_current_amd64.deb' && \ dpkg -i '/src/google-chrome-beta_current_amd64.deb' && \
dpkg -i '/src/google-talkplugin_current_amd64.deb' \ dpkg -i '/src/google-talkplugin_current_amd64.deb' \

View File

@ -15,7 +15,7 @@
# #
# Base docker image # Base docker image
FROM debian:stretch FROM debian:jessie
MAINTAINER Jessica Frazelle <jess@docker.com> MAINTAINER Jessica Frazelle <jess@docker.com>
ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.deb ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.deb
@ -23,12 +23,11 @@ ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/
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 mkdir -p /usr/share/icons/hicolor && \ RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sources.list && \
apt-get update && apt-get install -y \ apt-get update && apt-get install -y \
ca-certificates \ ca-certificates \
fonts-liberation \ fonts-liberation \
fonts-roboto \ fonts-roboto \
fonts-symbola \
gconf-service \ gconf-service \
hicolor-icon-theme \ hicolor-icon-theme \
libappindicator1 \ libappindicator1 \
@ -51,6 +50,8 @@ RUN mkdir -p /usr/share/icons/hicolor && \
strace \ strace \
wget \ wget \
xdg-utils \ xdg-utils \
-t testing \
fonts-symbola \
--no-install-recommends && \ --no-install-recommends && \
dpkg -i '/src/google-chrome-stable_current_amd64.deb' && \ dpkg -i '/src/google-chrome-stable_current_amd64.deb' && \
dpkg -i '/src/google-talkplugin_current_amd64.deb' \ dpkg -i '/src/google-talkplugin_current_amd64.deb' \

View File

@ -27,7 +27,7 @@ MAINTAINER Jessica Frazelle <jess@docker.com>
ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.deb ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.deb
# Install Chromium # Install Chromium
RUN echo 'deb http://httpredir.debian.org/debian stretch main' >> /etc/apt/sources.list && \ RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sources.list && \
apt-get update && apt-get install -y \ apt-get update && apt-get install -y \
chromium \ chromium \
chromium-l10n \ chromium-l10n \
@ -40,7 +40,8 @@ RUN echo 'deb http://httpredir.debian.org/debian stretch main' >> /etc/apt/sourc
libgl1-mesa-glx \ libgl1-mesa-glx \
libpango1.0-0 \ libpango1.0-0 \
libv4l-0 \ libv4l-0 \
-t stretch fonts-symbola \ -t testing \
fonts-symbola \
--no-install-recommends \ --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& mkdir -p /etc/chromium.d/ \ && mkdir -p /etc/chromium.d/ \