From aae3f0e6ac33382ad557888c1c98580fe97e617c Mon Sep 17 00:00:00 2001 From: surbhicis Date: Fri, 1 Apr 2022 15:57:04 +0530 Subject: [PATCH] Docker bug fixes --- .buildbot/android/Dockerfile | 6 ++++-- .buildbot/kivy/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.buildbot/android/Dockerfile b/.buildbot/android/Dockerfile index 890355e1..f8b8f673 100644 --- a/.buildbot/android/Dockerfile +++ b/.buildbot/android/Dockerfile @@ -2,16 +2,18 @@ FROM ubuntu:bionic AS android # FROM ubuntu:20.04 AS buildbot-bionic +RUN apt -y update -qq +RUN apt -y install wget + RUN wget -nc "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" RUN wget -nc "https://dl.google.com/android/repository/android-ndk-r23b-linux.zip" RUN wget -nc "http://archive.apache.org/dist/ant/binaries/apache-ant-1.10.12-bin.tar.gz" # SYSTEM DEPENDENCIES -RUN apt -y update -qq RUN apt -y install --no-install-recommends python3-pip \ pip3 python3 virtualenv python3-setuptools \ - python3-wheel git wget unzip sudo patch bzip2 lzma + python3-wheel git unzip sudo patch bzip2 lzma RUN apt -y autoremove # BUILD DEPENDENCIES diff --git a/.buildbot/kivy/Dockerfile b/.buildbot/kivy/Dockerfile index e46b16bf..4e78165e 100644 --- a/.buildbot/kivy/Dockerfile +++ b/.buildbot/kivy/Dockerfile @@ -14,6 +14,6 @@ RUN apt-get install -yq python-setuptools \ python3-virtualenv \ python3-pip \ -RUN sudo wget -0 "/usr/local/bin/travis2bash.sh" "https://git.bitmessage.org/Bitmessage/buildbot-scripts/raw/branch/master/travis2bash.sh" +RUN sudo wget -O "/usr/local/bin/travis2bash.sh" "https://git.bitmessage.org/Bitmessage/buildbot-scripts/raw/branch/master/travis2bash.sh" RUN sudo chmod a+rx "/usr/local/bin/travis2bash.sh"