fix other adds

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
This commit is contained in:
Jess Frazelle 2018-03-23 19:58:57 -04:00
parent cfacaf709e
commit df4ad1b662
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
3 changed files with 42 additions and 11 deletions

View File

@ -27,11 +27,11 @@ ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/
# Install Chrome # Install Chrome
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
apt-transport-https \ apt-transport-https \
libcanberra-gtk* \
ca-certificates \ ca-certificates \
curl \ curl \
gnupg \ gnupg \
hicolor-icon-theme \ hicolor-icon-theme \
libcanberra-gtk* \
libgl1-mesa-dri \ libgl1-mesa-dri \
libgl1-mesa-glx \ libgl1-mesa-glx \
libpango1.0-0 \ libpango1.0-0 \
@ -44,11 +44,21 @@ RUN apt-get update && apt-get install -y \
&& 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 \
&& dpkg -i '/src/google-talkplugin_current_amd64.deb' \
&& apt-get purge --auto-remove -y curl \ && apt-get purge --auto-remove -y curl \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/*
&& rm -rf /src/*.deb
# Download the google-talkplugin
RUN buildDeps=' \
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
# 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 \
&& mkdir -p /home/chrome/Downloads && chown -R chrome:chrome /home/chrome && mkdir -p /home/chrome/Downloads && chown -R chrome:chrome /home/chrome

View File

@ -26,12 +26,12 @@ ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/
# Install Chrome # Install Chrome
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libcanberra-gtk* \
apt-transport-https \ apt-transport-https \
ca-certificates \ ca-certificates \
curl \ curl \
gnupg \ gnupg \
hicolor-icon-theme \ hicolor-icon-theme \
libcanberra-gtk* \
libgl1-mesa-dri \ libgl1-mesa-dri \
libgl1-mesa-glx \ libgl1-mesa-glx \
libpango1.0-0 \ libpango1.0-0 \
@ -44,10 +44,21 @@ RUN apt-get update && apt-get install -y \
&& 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 \
&& dpkg -i '/src/google-talkplugin_current_amd64.deb' \
&& apt-get purge --auto-remove -y curl \ && apt-get purge --auto-remove -y curl \
&& rm -rf /var/lib/apt/lists/*
# Download the google-talkplugin
RUN buildDeps=' \
ca-certificates \
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/* \
&& rm -rf /src/*.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 \
&& rm -rf /tmp/*.deb \
&& apt-get purge -y --auto-remove $buildDeps
# 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

@ -21,8 +21,6 @@
FROM debian:buster FROM debian:buster
LABEL maintainer "Jessie Frazelle <jess@linux.com>" LABEL 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 Chromium # Install Chromium
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
chromium \ chromium \
@ -40,8 +38,20 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& mkdir -p /etc/chromium.d/ \ && mkdir -p /etc/chromium.d/ \
&& /bin/echo -e 'export GOOGLE_API_KEY="AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k"\nexport GOOGLE_DEFAULT_CLIENT_ID="811574891467.apps.googleusercontent.com"\nexport GOOGLE_DEFAULT_CLIENT_SECRET="kdloedMFGdGla2P1zacGjAQh"' > /etc/chromium.d/googleapikeys \ && /bin/echo -e 'export GOOGLE_API_KEY="AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k"\nexport GOOGLE_DEFAULT_CLIENT_ID="811574891467.apps.googleusercontent.com"\nexport GOOGLE_DEFAULT_CLIENT_SECRET="kdloedMFGdGla2P1zacGjAQh"' > /etc/chromium.d/googleapikeys
&& dpkg -i '/src/google-talkplugin_current_amd64.deb'
# Download the google-talkplugin
RUN buildDeps=' \
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
# Add chromium user # Add chromium user
RUN groupadd -r chromium && useradd -r -g chromium -G audio,video chromium \ RUN groupadd -r chromium && useradd -r -g chromium -G audio,video chromium \