Docker bug fixes
This commit is contained in:
parent
70dcb944c8
commit
aae3f0e6ac
|
@ -2,16 +2,18 @@
|
||||||
FROM ubuntu:bionic AS android
|
FROM ubuntu:bionic AS android
|
||||||
# FROM ubuntu:20.04 AS buildbot-bionic
|
# 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/sdk-tools-linux-4333796.zip"
|
||||||
RUN wget -nc "https://dl.google.com/android/repository/android-ndk-r23b-linux.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"
|
RUN wget -nc "http://archive.apache.org/dist/ant/binaries/apache-ant-1.10.12-bin.tar.gz"
|
||||||
|
|
||||||
# SYSTEM DEPENDENCIES
|
# SYSTEM DEPENDENCIES
|
||||||
|
|
||||||
RUN apt -y update -qq
|
|
||||||
RUN apt -y install --no-install-recommends python3-pip \
|
RUN apt -y install --no-install-recommends python3-pip \
|
||||||
pip3 python3 virtualenv python3-setuptools \
|
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
|
RUN apt -y autoremove
|
||||||
|
|
||||||
# BUILD DEPENDENCIES
|
# BUILD DEPENDENCIES
|
||||||
|
|
|
@ -14,6 +14,6 @@ RUN apt-get install -yq python-setuptools \
|
||||||
python3-virtualenv \
|
python3-virtualenv \
|
||||||
python3-pip \
|
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"
|
RUN sudo chmod a+rx "/usr/local/bin/travis2bash.sh"
|
||||||
|
|
Reference in New Issue
Block a user