diff --git a/Dockerfile b/Dockerfile index e32cefd..a65231d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ RUN echo "**** setup environment ****" && \ export PATH=$QT_INSTALL_DIR/bin:$JAVA_HOME/bin:$PATH && \ export QT_EVERYWHERE_URL="https://download.qt.io/archive/qt/${QT_VERSION_FAMILY}/${QT_VERSION}/single/qt-everywhere-opensource-src-${QT_VERSION}.tar.xz" && \ export ANDROID_CLI_TOOLS_URL="https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip" && \ + export ANDROID_OPENSSL_URL="https://github.com/KDAB/android_openssl/archive/refs/tags/${OPENSSL_VERSION}.tar.gz" && \ \ echo "**** install dependencies ****" && \ dpkg --add-architecture i386 && \ @@ -26,11 +27,14 @@ RUN echo "**** setup environment ****" && \ echo "**** download Qt and android-cli-tools ****" && \ wget -O qt-everywhere.tar.xz ${QT_EVERYWHERE_URL} && \ wget -O android-cli-tools.zip ${ANDROID_CLI_TOOLS_URL} && \ + wget -O android_openssl.tar.gz ${ANDROID_OPENSSL_URL} && \ \ echo "**** extract Qt and android-cli-tools ****" && \ mkdir qt-everywhere && \ tar -xf qt-everywhere.tar.xz --strip-components=1 -C ./qt-everywhere && \ unzip android-cli-tools.zip && \ + mkdir -p /usr/lib/android-sdk/android_openssl && \ + tar -xf android_openssl.tar.xz --strip-components=1 -C /usr/lib/android-sdk/android_openssl && \ \ echo "**** install android sdk ****" && \ echo "y" | ./cmdline-tools/bin/sdkmanager --sdk_root=/usr/lib/android-sdk --install "platform-tools" "platforms;${ANDROID_PLATFORM_VERSION}" "build-tools;${ANDROID_BUILDTOOLS_VERSION}" "ndk;${ANDROID_NDK_VERSION}" && \ @@ -58,11 +62,6 @@ RUN echo "**** setup environment ****" && \ rm -rf workspace && \ echo "**** done ****" -RUN echo "**** download openssl binaries ****" && \ - wget https://github.com/KDAB/android_openssl/archive/refs/tags/${OPENSSL_VERSION}.tar.gz -o android_openssl.tar.gz && \ - tar -xf android_openssl.tar.xz --strip-components=1 -C /usr/lib/android-sdk/android_openssl && \ - rm android_openssl.tar.gz - ENV PATH="${PATH}:/usr/lib/qt/bin:/usr/lib/jvm/java-8-openjdk-amd64/bin" ENV ANDROID_HOME=/usr/lib/android-sdk WORKDIR /src