Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
Signed-off-by: Jess Frazelle <acidburn@google.com>
  • Loading branch information
jessfraz committed Oct 25, 2016
1 parent d639673 commit 9642b95
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
7 changes: 3 additions & 4 deletions chrome/beta/Dockerfile
Expand Up @@ -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

# Install Chrome
RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sources.list && \
apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y \
apt-transport-https \
ca-certificates \
curl \
gnupg \
Expand All @@ -31,11 +31,10 @@ RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sourc
libgl1-mesa-glx \
libpulse0 \
libv4l-0 \
-t testing \
fonts-symbola \
--no-install-recommends \
&& 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 \
google-chrome-beta \
--no-install-recommends \
Expand Down
7 changes: 3 additions & 4 deletions chrome/stable/Dockerfile
Expand Up @@ -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

# Install Chrome
RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sources.list && \
apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y \
apt-transport-https \
ca-certificates \
curl \
gnupg \
Expand All @@ -31,11 +31,10 @@ RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sourc
libgl1-mesa-glx \
libpulse0 \
libv4l-0 \
-t testing \
fonts-symbola \
--no-install-recommends \
&& 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 \
google-chrome-stable \
--no-install-recommends \
Expand Down
2 changes: 2 additions & 0 deletions privoxy/Dockerfile
Expand Up @@ -2,6 +2,8 @@
#
# docker run -d \
# --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 \
# -v /etc/localtime:/etc/localtime:ro \
# -p 8118:8118 \
Expand Down

0 comments on commit 9642b95

Please sign in to comment.