Compare commits

...

4 commits

Author SHA1 Message Date
Dorian Zedler fff744a9bb
Fix: remove accidental paste
All checks were successful
continuous-integration/drone/tag Build is passing
2023-02-05 14:00:55 +01:00
Dorian Zedler 26e8360d65
Fix: go back to workspace
Some checks failed
continuous-integration/drone/tag Build is failing
2023-02-05 13:38:15 +01:00
Dorian Zedler 396b88d13c
Fix: remove git pull
Some checks failed
continuous-integration/drone/tag Build is failing
2023-02-05 13:26:38 +01:00
Dorian Zedler 3598c41f07
Feat: use newer openssl libs
Some checks failed
continuous-integration/drone/tag Build is failing
2023-02-05 12:44:39 +01:00

View file

@ -6,7 +6,7 @@ ARG QT_VERSION="5.15.5"
ARG ANDROID_PLATFORM_VERSION="android-29"
ARG ANDROID_BUILDTOOLS_VERSION="29.0.2"
ARG ANDROID_NDK_VERSION="21.3.6528147"
ARG OPENSSL_VERSION="1.1.1l_1.0.2u"
ARG OPENSSL_VERSION="aef7ae2"
WORKDIR /workspace
@ -27,14 +27,18 @@ 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.gz --strip-components=1 -C /usr/lib/android-sdk/android_openssl && \
mkdir -p /usr/lib/android-sdk && \
\
echo "**** download prebuilt openssl libs ****" && \
git clone https://github.com/KDAB/android_openssl.git /usr/lib/android-sdk/android_openssl && \
cd /usr/lib/android-sdk/android_openssl && \
git checkout "${OPENSSL_VERSION}" && \
cd /workspace && \
\
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}" && \