Merge pull request #349 from vania-pooh/master

Using curl instead of wget to download certificates and keys (related…
aerokube · Feb 14, 2021 · 2af765e · 2af765e
2 parents 02a0dd4 + 6dfed8d
commit 2af765e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/selenium/opera_presto/Dockerfile b/selenium/opera_presto/Dockerfile
@@ -1,7 +1,7 @@
 FROM browsers/base:7.2
 
 RUN  \
-        wget -O- http://deb.opera.com/archive.key | apt-key add - && \
+        curl -s http://deb.opera.com/archive.key | apt-key add - && \
         echo 'deb http://deb.opera.com/opera/ stable non-free' >> /etc/apt/sources.list.d/opera.list && \
         apt-get update && \
         apt-get -y install opera=12.16.1860 openjdk-8-jre-headless && \

diff --git a/static/chrome/apt/Dockerfile b/static/chrome/apt/Dockerfile
@@ -7,7 +7,7 @@ ARG INSTALL_DIR=chrome
 LABEL browser=$PACKAGE:$VERSION
 
 RUN \
-        wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+        curl -s https://dl-ssl.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 && \
         apt-get update && \
         apt-get -y --no-install-recommends install iproute2 $PACKAGE=$VERSION && \

diff --git a/static/edge/apt/Dockerfile b/static/edge/apt/Dockerfile
@@ -7,7 +7,7 @@ ARG INSTALL_DIR=msedge-beta
 LABEL browser=$PACKAGE:$VERSION
 
 RUN \
-        wget -q -O - https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
+        curl -s https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
         echo 'deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main' > /etc/apt/sources.list.d/microsoft-edge.list && \
         apt-get update && \
         apt-get -y --no-install-recommends install $PACKAGE=$VERSION && \

diff --git a/static/firefox/local/Dockerfile b/static/firefox/local/Dockerfile
@@ -9,20 +9,20 @@ LABEL browser=$PACKAGE:$VERSION
 RUN \
         ( \
             ( \
-                wget -O firefox.deb http://host.docker.internal:8080/firefox_amd64.deb && \
+                curl -o firefox.deb http://host.docker.internal:8080/firefox_amd64.deb && \
                 apt-get update && \
                 apt-get -y --no-install-recommends install iproute2 libavcodec57 && \
                 apt-get -y install libgtk-3-0 libstartup-notification0 libdbus-glib-1-2 \
             ) || \
             ( \
-                wget -O firefox.deb http://host.docker.internal:8080/firefox_i386.deb && \
+                curl -0 firefox.deb http://host.docker.internal:8080/firefox_i386.deb && \
                 dpkg --add-architecture i386 && \
                 apt-get update && \
                 apt-get -y --no-install-recommends install iproute2 libavcodec57 && \
                 apt-get -y install libc6:i386 libncurses5:i386 libstdc++6:i386 libgtk-3-0:i386 libasound2:i386 libdbus-glib-1-2:i386 libxt6:i386 libatomic1:i386 libcairo-gobject2:i386 libstartup-notification0:i386 libx11-xcb1:i386 && \
                 mkdir flashplayer && \
                 cd flashplayer && \
-                wget -O flashplayer.tar.gz https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.387/flash_player_ppapi_linux.i386.tar.gz && \
+                curl -o flashplayer.tar.gz https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.387/flash_player_ppapi_linux.i386.tar.gz && \
                 tar xvzf flashplayer.tar.gz && \
                 cp libpepflashplayer.so /usr/lib/flashplugin-installer/libflashplayer.so && \
                 cd .. && \

diff --git a/static/opera/apt/Dockerfile b/static/opera/apt/Dockerfile
@@ -6,7 +6,7 @@ ARG PACKAGE=opera-stable
 LABEL browser=$PACKAGE:$VERSION
 
 RUN  \
-        wget -O- http://deb.opera.com/archive.key | apt-key add - && \
+        curl -s http://deb.opera.com/archive.key | apt-key add - && \
         echo 'deb http://deb.opera.com/opera-stable/ stable non-free' > /etc/apt/sources.list.d/opera-blink.list && \
         apt-get update && \
         apt-get -y --no-install-recommends install $PACKAGE=$VERSION && \

diff --git a/static/yandex/apt/Dockerfile b/static/yandex/apt/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION=19.4.2.698-1
 LABEL browser=yandex-browser-beta:$VERSION
 
 RUN  \
-        wget -O- https://repo.yandex.ru/yandex-browser/YANDEX-BROWSER-KEY.GPG | apt-key add - && \
+        curl -s https://repo.yandex.ru/yandex-browser/YANDEX-BROWSER-KEY.GPG | apt-key add - && \
         echo 'deb [arch=amd64] http://repo.yandex.ru/yandex-browser/deb beta main' > /etc/apt/sources.list.d/yandex-browser.list && \
         apt-get update && \
         apt-get -y --no-install-recommends install yandex-browser-beta=$VERSION && \