From ea70191ee2db3343bd4fec7d2980ae7fa09c5cfa Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Wed, 2 Dec 2020 10:30:37 +0000 Subject: [PATCH] Curl fix --- docker/Dockerfile.viewer | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile.viewer b/docker/Dockerfile.viewer index eb8b1925..66527bd9 100644 --- a/docker/Dockerfile.viewer +++ b/docker/Dockerfile.viewer @@ -5,7 +5,6 @@ RUN apt-get update && \ apt-get -y install \ build-essential \ ca-certificates \ - curl \ git-core \ gstreamer1.0-plugins-base \ gstreamer1.0-plugins-good \ @@ -116,19 +115,19 @@ RUN c_rehash ARG PI_VERSION=pi3 ARG DEBIAN_VERSION=buster ARG QT_VERSION=5.15.2 -RUN wget "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz" \ +RUN curl "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz" \ -s -o /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz && \ - wget "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256" \ + curl "https://storage.googleapis.com/ose-lab/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256" \ -s -o /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 && \ cd /tmp && \ sha256sum -c qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 && \ tar -xzf /tmp/qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz -C /usr/local && \ rm qtbase-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz* -RUN wget "https://storage.googleapis.com/ose-lab/webview-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz" \ - -q -O /tmp/webview-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz && \ - wget "https://storage.googleapis.com/ose-lab/webview-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256" \ - -q -O /tmp/webview-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 && \ +RUN curl "https://storage.googleapis.com/ose-lab/webview-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz" \ + -s -o /tmp/webview-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz && \ + curl "https://storage.googleapis.com/ose-lab/webview-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256" \ + -s -o /tmp/webview-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 && \ cd /tmp && \ sha256sum -c webview-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz.sha256 && \ tar -xzf /tmp/webview-$QT_VERSION-$DEBIAN_VERSION-$PI_VERSION.tar.gz -C /usr/local && \