Skip to content

Commit

Permalink
update Qt 5.15 to the latest maintained by KDE, openssl and SQLite
Browse files Browse the repository at this point in the history
build image for AppImage packaging

Signed-off-by: Matthieu Gallien <[email protected]>
  • Loading branch information
mgallien committed Feb 6, 2024
1 parent d09074c commit 5bfae12
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions client-appimage/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
FROM ubuntu:18.04
FROM ubuntu:20.04

MAINTAINER Desktop Team <[email protected]>

# Run 'docker build' with '--build-arg BUILD_QT=1' to build Qt from source (default: not set)
ARG BUILD_QT

ENV VER_QT kde-5.15
ENV VER_QT_DATE 2023-08-22
ENV VER_OPENSSL 3.0.10
ENV VER_QT_DATE 2024-02-05
ENV VER_OPENSSL 3.1.4
ENV VER_LIBP11 libp11-0.4.12
ENV VER_KFRAMEWORKS 5.107.0
ENV VER_SQLITE 3430000
ENV VER_SQLITE_YEAR 2023
ENV VER_SQLITE 3450100
ENV VER_SQLITE_YEAR 2024

ENV QT_ROOT /opt/qt${VER_QT}

# https://askubuntu.com/questions/158871/how-do-i-enable-the-source-code-repositories
RUN sed -i '/deb-src/s/^# //' /etc/apt/sources.list && \
apt-get update && \
apt-get install -y apt-transport-https ca-certificates gnupg software-properties-common wget && \
DEBIAN_FRONTEND=noninteractive apt-get install -q -y software-properties-common && \
apt-get install -y --no-install-recommends apt-transport-https ca-certificates gnupg software-properties-common wget && \
DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends software-properties-common && \
rm -rf /var/lib/apt/lists/* && \
# Ubuntus version of inkscape is outdated
add-apt-repository -y ppa:inkscape.dev/stable && \
Expand All @@ -28,7 +28,7 @@ RUN sed -i '/deb-src/s/^# //' /etc/apt/sources.list && \
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \
# Install packages
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -q -y \
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -q -y \
git \
ninja-build \
curl \
Expand Down Expand Up @@ -170,7 +170,7 @@ RUN if [ "$BUILD_QT" = "1" ] ; then \
# Build Qt
RUN if [ "$BUILD_QT" = "1" ] ; then \
# Do not require matching versions of Qt dependencies for WebEngine modules
sed -i "s/5.15.14 /5.15.10 /" ${QT_ROOT}/lib/cmake/*/*Config.cmake \
sed -i "s/5.15.17 /5.15.12 /" ${QT_ROOT}/lib/cmake/*/*Config.cmake \
; fi

# Build Qt
Expand Down

0 comments on commit 5bfae12

Please sign in to comment.