From 56ddd5c6fcd11e41322309d3d78d21a77e274855 Mon Sep 17 00:00:00 2001 From: samo38 Date: Fri, 20 Dec 2024 10:14:36 -0700 Subject: [PATCH] update redhat version to 8.10 and qt version to 5.15.16 --- admin/release/buildpkg.pl | 2 +- admin/release/redhat/Dockerfile | 2 +- admin/release/ubuntu/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/release/buildpkg.pl b/admin/release/buildpkg.pl index ba1cb9edd..5518ab22e 100755 --- a/admin/release/buildpkg.pl +++ b/admin/release/buildpkg.pl @@ -16,7 +16,7 @@ "ubuntu:18.04" => "python" ,"ubuntu:20.04" => "python" ,"ubuntu:22.04" => "python3" - ,"redhat:8.7" => "python3" + ,"redhat:8.10" => "python3" ); $snames = join( "\n", keys %supported ); diff --git a/admin/release/redhat/Dockerfile b/admin/release/redhat/Dockerfile index 5e1d1db18..b02028b5f 100644 --- a/admin/release/redhat/Dockerfile +++ b/admin/release/redhat/Dockerfile @@ -12,7 +12,7 @@ ARG ultrascan_branch=master ## qt defaults ARG qt_major_version=5.15 -ARG qt_version=5.15.8 +ARG qt_version=5.15.16 ARG qwt_version=6.1.6 ### N.B. qwt_version is hard coded in the local.pri.somo so we need to change this & in the codeql container & workflow/codeql-analysis.yml diff --git a/admin/release/ubuntu/Dockerfile b/admin/release/ubuntu/Dockerfile index 153f825a3..18fd875a2 100644 --- a/admin/release/ubuntu/Dockerfile +++ b/admin/release/ubuntu/Dockerfile @@ -12,7 +12,7 @@ ARG ultrascan_branch=master ## qt defaults ARG qt_major_version=5.15 -ARG qt_version=5.15.12 +ARG qt_version=5.15.16 ARG qwt_version=6.1.6 ### N.B. qwt_version is hard coded in the local.pri.somo so we need to change this & in the codeql container & workflow/codeql-analysis.yml