From e243ab3b172f963471d438ff20eb2ae3860d5492 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 15 Jan 2025 12:19:34 +0100 Subject: [PATCH 1/2] remove the version number from Qt installation path will enable every build to use a constant known Qt path Signed-off-by: Matthieu Gallien --- client-appimage-qt6/Dockerfile | 2 +- client-qt6/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client-appimage-qt6/Dockerfile b/client-appimage-qt6/Dockerfile index 604ea70..b2494e5 100644 --- a/client-appimage-qt6/Dockerfile +++ b/client-appimage-qt6/Dockerfile @@ -14,7 +14,7 @@ ENV VER_SQLITE 3460100 ENV VER_SQLITE_YEAR 2024 ENV VER_QTKEYCHAIN 0.14.3 -ENV QT_ROOT /opt/qt${VER_QT} +ENV QT_ROOT /opt/qt RUN sed -i '/deb-src/s/^# //' /etc/apt/sources.list && \ apt-get update && \ diff --git a/client-qt6/Dockerfile b/client-qt6/Dockerfile index 64d57b9..0b7e167 100644 --- a/client-qt6/Dockerfile +++ b/client-qt6/Dockerfile @@ -14,7 +14,7 @@ ENV VER_SQLITE 3460100 ENV VER_SQLITE_YEAR 2024 ENV VER_QTKEYCHAIN 0.14.3 -ENV QT_ROOT /opt/qt${VER_QT} +ENV QT_ROOT /opt/qt RUN sed -i '/deb-src/s/^# //' /etc/apt/sources.list && \ apt-get update && \ From 79df0a33cfcb92a2d1ff16f4e72d49b749abe853 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 15 Jan 2025 12:32:20 +0100 Subject: [PATCH 2/2] update Qt and openssl in the desktop files client images Signed-off-by: Matthieu Gallien --- client-appimage-qt6/Dockerfile | 8 ++++---- client-qt6/Dockerfile | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client-appimage-qt6/Dockerfile b/client-appimage-qt6/Dockerfile index b2494e5..7982ef1 100644 --- a/client-appimage-qt6/Dockerfile +++ b/client-appimage-qt6/Dockerfile @@ -5,11 +5,11 @@ MAINTAINER Desktop Team # Run 'docker build' with '--build-arg BUILD_QT=1' to build Qt from source (default: not set) ARG BUILD_QT -ENV VER_QT 6.8.0 -ENV VER_QT_DATE 2024-12-02 -ENV VER_OPENSSL 3.3.2 +ENV VER_QT 6.8.1 +ENV VER_QT_DATE 2025-01-16 +ENV VER_OPENSSL 3.4.0 ENV VER_LIBP11 libp11-0.4.12 -ENV VER_KFRAMEWORKS 6.7.0 +ENV VER_KFRAMEWORKS 6.10.0 ENV VER_SQLITE 3460100 ENV VER_SQLITE_YEAR 2024 ENV VER_QTKEYCHAIN 0.14.3 diff --git a/client-qt6/Dockerfile b/client-qt6/Dockerfile index 0b7e167..70c7c3b 100644 --- a/client-qt6/Dockerfile +++ b/client-qt6/Dockerfile @@ -5,11 +5,11 @@ MAINTAINER Desktop Team # Run 'docker build' with '--build-arg BUILD_QT=1' to build Qt from source (default: not set) ARG BUILD_QT -ENV VER_QT 6.8.0 -ENV VER_QT_DATE 2024-12-02 -ENV VER_OPENSSL 3.3.2 +ENV VER_QT 6.8.1 +ENV VER_QT_DATE 2025-01-16 +ENV VER_OPENSSL 3.4.0 ENV VER_LIBP11 libp11-0.4.12 -ENV VER_KFRAMEWORKS 6.7.0 +ENV VER_KFRAMEWORKS 6.10.0 ENV VER_SQLITE 3460100 ENV VER_SQLITE_YEAR 2024 ENV VER_QTKEYCHAIN 0.14.3