fix other adds

Signed-off-by: Jess Frazelle <[email protected]>
Harshhaa-Dev-Projects · Mar 23, 2018 · df4ad1b · df4ad1b
1 parent cfacaf7
commit df4ad1b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 11 deletions.
diff --git a/chrome/beta/Dockerfile b/chrome/beta/Dockerfile
@@ -27,11 +27,11 @@ ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/
 # Install Chrome
 RUN apt-get update && apt-get install -y \
 	apt-transport-https \
-        libcanberra-gtk* \
 	ca-certificates \
 	curl \
 	gnupg \
 	hicolor-icon-theme \
+	libcanberra-gtk* \
 	libgl1-mesa-dri \
 	libgl1-mesa-glx \
 	libpango1.0-0 \
@@ -44,11 +44,21 @@ RUN apt-get update && apt-get install -y \
 	&& apt-get update && apt-get install -y \
 	google-chrome-beta \
 	--no-install-recommends \
-	&& dpkg -i '/src/google-talkplugin_current_amd64.deb' \
 	&& apt-get purge --auto-remove -y curl \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& rm -rf /src/*.deb
+	&& 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/* \
+	&& 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
 RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \
     && mkdir -p /home/chrome/Downloads && chown -R chrome:chrome /home/chrome

diff --git a/chrome/stable/Dockerfile b/chrome/stable/Dockerfile
@@ -26,12 +26,12 @@ ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/
 
 # Install Chrome
 RUN apt-get update && apt-get install -y \
-	libcanberra-gtk* \
 	apt-transport-https \
 	ca-certificates \
 	curl \
 	gnupg \
 	hicolor-icon-theme \
+	libcanberra-gtk* \
 	libgl1-mesa-dri \
 	libgl1-mesa-glx \
 	libpango1.0-0 \
@@ -44,10 +44,21 @@ RUN apt-get update && apt-get install -y \
 	&& apt-get update && apt-get install -y \
 	google-chrome-stable \
 	--no-install-recommends \
-	&& dpkg -i '/src/google-talkplugin_current_amd64.deb' \
 	&& 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 /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
 RUN groupadd -r chrome && useradd -r -g chrome -G audio,video chrome \

diff --git a/chromium/Dockerfile b/chromium/Dockerfile
@@ -21,8 +21,6 @@
 FROM debian:buster
 LABEL maintainer "Jessie Frazelle <[email protected]>"
 
-ADD https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb /src/google-talkplugin_current_amd64.deb
-
 # Install Chromium
 RUN apt-get update && apt-get install -y \
       chromium \
@@ -40,8 +38,20 @@ RUN apt-get update && apt-get install -y \
       --no-install-recommends \
     && rm -rf /var/lib/apt/lists/* \
     && 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 \
-    && dpkg -i '/src/google-talkplugin_current_amd64.deb'
+    && /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
+
+# 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
 RUN groupadd -r chromium && useradd -r -g chromium -G audio,video chromium \