From 3ffdfb6e2190f6ae461893c485d1d2e6a9a98c42 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Sat, 21 Aug 2021 18:46:34 +0100 Subject: [PATCH] update Docker build and Gitlab CI --- .gitlab-ci.yml | 4 +- docker/Dockerfile.python3.10.platform-28 | 52 +++++++++++++----------- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c5d128..1ae9334 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ build arm64 aar: - rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz - mv buildozer.spec.arm64.ci buildozer.spec - chmod u+x ./build-release.sh - - "./build-release.sh | grep -Fv -e 'working:' -e 'copy' -e 'Compiling' --line-buffered" + - "./build-release.sh - cp $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-release.aar $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-release__arm64.aar - cp $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-release.aar /dev/null @@ -51,7 +51,7 @@ build arm aar: - rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz - mv buildozer.spec.arm.ci buildozer.spec - chmod u+x ./build-release.sh - - "./build-release.sh | grep -Fv -e 'working:' -e 'copy' -e 'Compiling' --line-buffered" + - "./build-release.sh - cp $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-release.aar $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-release__arm.aar - cp $CI_PROJECT_DIR/bin/lbrysdk-$BUILD_VERSION-release.aar /dev/null diff --git a/docker/Dockerfile.python3.10.platform-28 b/docker/Dockerfile.python3.10.platform-28 index 616e16d..5300f24 100644 --- a/docker/Dockerfile.python3.10.platform-28 +++ b/docker/Dockerfile.python3.10.platform-28 @@ -1,42 +1,46 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 RUN export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 RUN dpkg --add-architecture i386 RUN apt-get -y update && apt-get -y install curl ca-certificates software-properties-common gpg-agent wget RUN add-apt-repository ppa:deadsnakes/ppa -y -RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf autogen automake libtool libffi-dev \ - build-essential python3.10 python3.10-dev python3.10-venv ccache git libncurses5:i386 libstdc++6:i386 \ - libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev \ - python-pip openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386 gawk +RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf autogen automake \ + libtool libffi-dev build-essential python3.10 python3.10-dev python3.10-venv ccache git \ + libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 \ + libidn11:i386 openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386 gawk RUN rm /usr/bin/python3 && ln -s /usr/bin/python3.10 /usr/bin/python3 -RUN rm /usr/bin/python && ln -s /usr/bin/python2.7 /usr/bin/python - -RUN pip install --upgrade cython==0.29.24 setuptools zipp==1.2.0 importlib-resources==1.0.2 importlib-metadata==0.20 virtualenv==20.4.7 appdirs sh colorama==0.3.3 jinja2 six pep517\<0.7.0 toml - -RUN wget https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py -RUN pip3 install --upgrade setuptools==51.0.0 +RUN rm -f /usr/bin/python && ln -s /usr/bin/python3.10 /usr/bin/python +RUN wget https://bootstrap.pypa.io/pip/get-pip.py && python3 get-pip.py +RUN pip install --upgrade cython==0.29.24 setuptools zipp importlib-resources importlib-metadata virtualenv appdirs sh colorama\>=0.3.3 jinja2 six pep517\<0.7.0 toml RUN git clone https://github.com/lbryio/buildozer.git -RUN cd buildozer && python2 setup.py install && cd .. +RUN cd buildozer && python setup.py install && cd .. RUN mkdir -p cd ~/.buildozer/android/platform/ RUN wget 'https://dl.google.com/android/android-sdk_r23-linux.tgz' -P ~/.buildozer/android/platform/ && \ wget 'https://dl.google.com/android/repository/platform-28_r06.zip' -P ~/.buildozer/android/platform/ && \ wget 'https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip' -P ~/.buildozer/android/platform/ && \ - tar -xvf ~/.buildozer/android/platform/android-sdk_r23-linux.tgz -C ~/.buildozer/android/platform/ && \ - mv ~/.buildozer/android/platform/android-sdk-linux ~/.buildozer/android/platform/android-sdk-23 && \ - unzip ~/.buildozer/android/platform/platform-28_r06.zip -d ~/.buildozer/android/platform/android-sdk-23/platforms && \ - mv ~/.buildozer/android/platform/android-sdk-23/platforms/android-9 ~/.buildozer/android/platform/android-sdk-23/platforms/android-28 && \ - mkdir -p ~/.buildozer/android/platform/android-sdk-23/build-tools && \ - unzip ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip -d ~/.buildozer/android/platform/android-sdk-23/build-tools && \ - mv ~/.buildozer/android/platform/android-sdk-23/build-tools/android-9 ~/.buildozer/android/platform/android-sdk-23/build-tools/28.0.3 && \ - rm ~/.buildozer/android/platform/android-sdk_r23-linux.tgz && \ - rm ~/.buildozer/android/platform/platform-28_r06.zip && \ - rm ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip + wget 'https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip' -P ~/.buildozer/android/platform -RUN mkdir -p ~/.buildozer/android/platform/android-sdk-23/licenses && \ - echo $'\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee' > ~/.buildozer/android/platform/android-sdk-23/licenses/android-sdk-license +RUN tar -xvf ~/.buildozer/android/platform/android-sdk_r23-linux.tgz -C ~/.buildozer/android/platform/ && \ + mv ~/.buildozer/android/platform/android-sdk-linux ~/.buildozer/android/platform/android-sdk && \ + unzip ~/.buildozer/android/platform/platform-28_r06.zip -d ~/.buildozer/android/platform/android-sdk/platforms && \ + mv ~/.buildozer/android/platform/android-sdk/platforms/android-9 ~/.buildozer/android/platform/android-sdk/platforms/android-28 && \ + mkdir -p ~/.buildozer/android/platform/android-sdk/build-tools && \ + unzip ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip -d ~/.buildozer/android/platform/android-sdk/build-tools && \ + mv ~/.buildozer/android/platform/android-sdk/build-tools/android-9 ~/.buildozer/android/platform/android-sdk/build-tools/28.0.3 && \ + unzip ~/.buildozer/android/platform/commandlinetools-linux-7583922_latest.zip -d ~/.buildozer/android/platform/android-sdk && \ + cp -Rf ~/.buildozer/android/platform/android-sdk/cmdline-tools/* ~/.buildozer/android/platform/android-sdk/tools && \ + rm -rf ~/.buildozer/android/platform/android-sdk/cmdline-tools + +RUN rm ~/.buildozer/android/platform/android-sdk_r23-linux.tgz && \ + rm ~/.buildozer/android/platform/platform-28_r06.zip && \ + rm ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip && \ + rm ~/.buildozer/android/platform/commandlinetools-linux-7583922_latest.zip + +RUN mkdir -p ~/.buildozer/android/platform/android-sdk/licenses && \ + echo $'\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee' > ~/.buildozer/android/platform/android-sdk/licenses/android-sdk-license CMD ["/bin/bash"]