mirror of
https://github.com/feather-wallet/feather.git
synced 2024-12-22 19:49:28 +00:00
Docker: bump Qt to v5.15.5
This commit is contained in:
parent
93865e552e
commit
04598c9e55
2 changed files with 3 additions and 3 deletions
|
@ -25,7 +25,7 @@ RUN bash verify-packages.sh && \
|
||||||
dpkg -i --force-depends *.deb && \
|
dpkg -i --force-depends *.deb && \
|
||||||
rm -rf /deps /archives
|
rm -rf /deps /archives
|
||||||
|
|
||||||
# OpenSSL: Required for CMake, Qt 5.15.2, libwallet, Tor
|
# OpenSSL: Required for CMake, Qt 5.15, libwallet, Tor
|
||||||
ENV OPENSSL_ROOT_DIR=/usr/local/openssl/
|
ENV OPENSSL_ROOT_DIR=/usr/local/openssl/
|
||||||
RUN git clone -b OpenSSL_1_1_1m --depth 1 https://github.com/openssl/openssl.git && \
|
RUN git clone -b OpenSSL_1_1_1m --depth 1 https://github.com/openssl/openssl.git && \
|
||||||
cd openssl && \
|
cd openssl && \
|
||||||
|
@ -73,7 +73,7 @@ RUN git clone -b 2.13.92 --depth 1 https://gitlab.freedesktop.org/fontconfig/fon
|
||||||
make -j$THREADS install && \
|
make -j$THREADS install && \
|
||||||
rm -rf $(pwd)
|
rm -rf $(pwd)
|
||||||
|
|
||||||
ENV QT_VERSION=v5.15.4-lts-lgpl
|
ENV QT_VERSION=v5.15.5-lts-lgpl
|
||||||
RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
|
RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
|
||||||
cd qt5 && \
|
cd qt5 && \
|
||||||
git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \
|
git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
FROM ubuntu:20.04
|
FROM ubuntu:20.04
|
||||||
|
|
||||||
ARG THREADS=1
|
ARG THREADS=1
|
||||||
ARG QT_VERSION=v5.15.4-lts-lgpl
|
ARG QT_VERSION=v5.15.5-lts-lgpl
|
||||||
ENV SOURCE_DATE_EPOCH=1397818193
|
ENV SOURCE_DATE_EPOCH=1397818193
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue