Skip to content

Commit

Permalink
Fix #368 so that chrome remains installed (#369)
Browse files Browse the repository at this point in the history
  • Loading branch information
svenssonaxel authored and jessfraz committed Apr 4, 2018
1 parent 326a1f7 commit 3301233
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
9 changes: 4 additions & 5 deletions chrome/beta/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,16 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/*

# Download the google-talkplugin
RUN buildDeps=' \
RUN set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
ca-certificates \
curl \
' \
&& set -x \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \
&& curl -sSL "https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb" -o /tmp/google-talkplugin-amd64.deb \
&& dpkg -i /tmp/google-talkplugin-amd64.deb \
&& rm -rf /tmp/*.deb \
&& apt-get purge -y --auto-remove $buildDeps
&& apt-get purge -y --auto-remove curl

# Add chrome user
RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \
Expand Down
9 changes: 4 additions & 5 deletions chrome/stable/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,16 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/*

# Download the google-talkplugin
RUN buildDeps=' \
RUN set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
ca-certificates \
curl \
' \
&& set -x \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \
&& curl -sSL "https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb" -o /tmp/google-talkplugin-amd64.deb \
&& dpkg -i /tmp/google-talkplugin-amd64.deb \
&& rm -rf /tmp/*.deb \
&& apt-get purge -y --auto-remove $buildDeps
&& apt-get purge -y --auto-remove curl

# Add chrome user
RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \
Expand Down

0 comments on commit 3301233

Please sign in to comment.