Signed-off-by: Jess Frazelle <acidburn@google.com>
This commit is contained in:
Jess Frazelle 2016-10-25 14:02:21 -07:00
parent d639673cf6
commit 9642b95d18
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
3 changed files with 8 additions and 8 deletions

View File

@ -21,8 +21,8 @@ MAINTAINER Jessie Frazelle <jess@linux.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 Chrome # Install Chrome
RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sources.list && \ RUN apt-get update && apt-get install -y \
apt-get update && apt-get install -y \ apt-transport-https \
ca-certificates \ ca-certificates \
curl \ curl \
gnupg \ gnupg \
@ -31,11 +31,10 @@ RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sourc
libgl1-mesa-glx \ libgl1-mesa-glx \
libpulse0 \ libpulse0 \
libv4l-0 \ libv4l-0 \
-t testing \
fonts-symbola \ fonts-symbola \
--no-install-recommends \ --no-install-recommends \
&& curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \ && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
&& echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list \ && echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list \
&& apt-get update && apt-get install -y \ && apt-get update && apt-get install -y \
google-chrome-beta \ google-chrome-beta \
--no-install-recommends \ --no-install-recommends \

View File

@ -21,8 +21,8 @@ MAINTAINER Jessie Frazelle <jess@linux.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 Chrome # Install Chrome
RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sources.list && \ RUN apt-get update && apt-get install -y \
apt-get update && apt-get install -y \ apt-transport-https \
ca-certificates \ ca-certificates \
curl \ curl \
gnupg \ gnupg \
@ -31,11 +31,10 @@ RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sourc
libgl1-mesa-glx \ libgl1-mesa-glx \
libpulse0 \ libpulse0 \
libv4l-0 \ libv4l-0 \
-t testing \
fonts-symbola \ fonts-symbola \
--no-install-recommends \ --no-install-recommends \
&& curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \ && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
&& echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list \ && echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list \
&& apt-get update && apt-get install -y \ && apt-get update && apt-get install -y \
google-chrome-stable \ google-chrome-stable \
--no-install-recommends \ --no-install-recommends \

View File

@ -2,6 +2,8 @@
# #
# docker run -d \ # docker run -d \
# --restart always \ # --restart always \
# # the link inside the container must be named "torproxy"
# # see: https://github.com/jessfraz/dockerfiles/blob/master/privoxy/privoxy.conf#L1317
# --link torproxy:torproxy \ # --link torproxy:torproxy \
# -v /etc/localtime:/etc/localtime:ro \ # -v /etc/localtime:/etc/localtime:ro \
# -p 8118:8118 \ # -p 8118:8118 \