Merge pull request #4066

6984bb8 docker: update Qt to 5.15.7 (selsta)
This commit is contained in:
luigi1111 2022-12-01 23:48:54 -06:00
commit 9924dfe8af
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 4 additions and 4 deletions

View file

@ -5,12 +5,12 @@ ARG ANDROID_NDK_REVISION=21e
ARG ANDROID_NDK_HASH=c3ebc83c96a4d7f539bd72c241b2be9dcd29bda9 ARG ANDROID_NDK_HASH=c3ebc83c96a4d7f539bd72c241b2be9dcd29bda9
ARG ANDROID_SDK_REVISION=7302050_latest ARG ANDROID_SDK_REVISION=7302050_latest
ARG ANDROID_SDK_HASH=7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622 ARG ANDROID_SDK_HASH=7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622
ARG QT_VERSION=v5.15.6-lts-lgpl ARG QT_VERSION=v5.15.7-lts-lgpl
WORKDIR /opt/android WORKDIR /opt/android
ENV WORKDIR=/opt/android ENV WORKDIR=/opt/android
ENV ANDROID_NATIVE_API_LEVEL=29 ENV ANDROID_NATIVE_API_LEVEL=30
ENV ANDROID_API=android-${ANDROID_NATIVE_API_LEVEL} ENV ANDROID_API=android-${ANDROID_NATIVE_API_LEVEL}
ENV ANDROID_CLANG=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang ENV ANDROID_CLANG=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang
ENV ANDROID_CLANGPP=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang++ ENV ANDROID_CLANGPP=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang++

View file

@ -1,7 +1,7 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
ARG THREADS=1 ARG THREADS=1
ARG QT_VERSION=v5.15.6-lts-lgpl ARG QT_VERSION=v5.15.7-lts-lgpl
ENV CFLAGS="-fPIC" ENV CFLAGS="-fPIC"
ENV CPPFLAGS="-fPIC" ENV CPPFLAGS="-fPIC"

View file

@ -1,7 +1,7 @@
FROM ubuntu:20.04 FROM ubuntu:20.04
ARG THREADS=1 ARG THREADS=1
ARG QT_VERSION=v5.15.6-lts-lgpl ARG QT_VERSION=v5.15.7-lts-lgpl
ENV SOURCE_DATE_EPOCH=1397818193 ENV SOURCE_DATE_EPOCH=1397818193
RUN apt update && \ RUN apt update && \