From 2092777ba73e4111038d581b201b54af390e2ee6 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Thu, 4 Feb 2016 11:34:12 -0800 Subject: [PATCH] update chrome Signed-off-by: Jessica Frazelle --- chrome/beta/Dockerfile | 7 ++++--- chrome/stable/Dockerfile | 7 ++++--- chromium/Dockerfile | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/chrome/beta/Dockerfile b/chrome/beta/Dockerfile index 7df0ff3..8d935c4 100644 --- a/chrome/beta/Dockerfile +++ b/chrome/beta/Dockerfile @@ -1,5 +1,5 @@ # Base docker image -FROM debian:stretch +FROM debian:jessie MAINTAINER Jessica Frazelle 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 # 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 \ ca-certificates \ fonts-liberation \ fonts-roboto \ - fonts-symbola \ gconf-service \ hicolor-icon-theme \ libappindicator1 \ @@ -35,6 +34,8 @@ RUN mkdir -p /usr/share/icons/hicolor && \ strace \ wget \ xdg-utils \ + -t testing \ + fonts-symbola \ --no-install-recommends && \ dpkg -i '/src/google-chrome-beta_current_amd64.deb' && \ dpkg -i '/src/google-talkplugin_current_amd64.deb' \ diff --git a/chrome/stable/Dockerfile b/chrome/stable/Dockerfile index 042c795..a50bec0 100644 --- a/chrome/stable/Dockerfile +++ b/chrome/stable/Dockerfile @@ -15,7 +15,7 @@ # # Base docker image -FROM debian:stretch +FROM debian:jessie MAINTAINER Jessica Frazelle 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 # 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 \ ca-certificates \ fonts-liberation \ fonts-roboto \ - fonts-symbola \ gconf-service \ hicolor-icon-theme \ libappindicator1 \ @@ -51,6 +50,8 @@ RUN mkdir -p /usr/share/icons/hicolor && \ strace \ wget \ xdg-utils \ + -t testing \ + fonts-symbola \ --no-install-recommends && \ dpkg -i '/src/google-chrome-stable_current_amd64.deb' && \ dpkg -i '/src/google-talkplugin_current_amd64.deb' \ diff --git a/chromium/Dockerfile b/chromium/Dockerfile index 94779c1..345ad37 100644 --- a/chromium/Dockerfile +++ b/chromium/Dockerfile @@ -27,7 +27,7 @@ MAINTAINER Jessica Frazelle ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.deb # 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 \ chromium \ chromium-l10n \ @@ -40,7 +40,8 @@ RUN echo 'deb http://httpredir.debian.org/debian stretch main' >> /etc/apt/sourc libgl1-mesa-glx \ libpango1.0-0 \ libv4l-0 \ - -t stretch fonts-symbola \ + -t testing \ + fonts-symbola \ --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /etc/chromium.d/ \