Fix #368 so that chrome remains installed (#369)

This commit is contained in:
svenssonaxel 2018-04-04 10:46:22 -04:00 committed by Jess Frazelle
parent 326a1f7527
commit 3301233387
2 changed files with 8 additions and 10 deletions

View File

@ -48,17 +48,16 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Download the google-talkplugin # Download the google-talkplugin
RUN buildDeps=' \ RUN set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
curl \ curl \
' \
&& set -x \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \ && 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 \ && 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 \ && dpkg -i /tmp/google-talkplugin-amd64.deb \
&& rm -rf /tmp/*.deb \ && rm -rf /tmp/*.deb \
&& apt-get purge -y --auto-remove $buildDeps && apt-get purge -y --auto-remove curl
# Add chrome user # Add chrome user
RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \ RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \

View File

@ -48,17 +48,16 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Download the google-talkplugin # Download the google-talkplugin
RUN buildDeps=' \ RUN set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
curl \ curl \
' \
&& set -x \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \ && 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 \ && 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 \ && dpkg -i /tmp/google-talkplugin-amd64.deb \
&& rm -rf /tmp/*.deb \ && rm -rf /tmp/*.deb \
&& apt-get purge -y --auto-remove $buildDeps && apt-get purge -y --auto-remove curl
# Add chrome user # Add chrome user
RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \ RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \