Skip to content

Commit 8dbf687

Browse files
committed
Update to rockylinux 9
1 parent d409dd7 commit 8dbf687

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

Dockerfile.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM rockylinux/rockylinux:8
1+
FROM rockylinux/rockylinux:9
22

33
# install epel-release for ccache
44
RUN dnf install -y epel-release && \
5-
dnf install --enablerepo=powertools -y \
5+
dnf install --enablerepo=crb -y \
66
bison \
77
ccache \
88
cmake \
9-
gcc-toolset-12 \
10-
gcc-toolset-12-gcc-c++ \
9+
gcc-toolset-14 \
10+
gcc-toolset-14-gcc-c++ \
1111
findutils \
1212
flex \
1313
git \
@@ -16,6 +16,6 @@ RUN dnf install -y epel-release && \
1616
subversion \
1717
unzip \
1818
zlib-devel && dnf clean all -y && rm -rf /var/cache/dnf
19-
ENV BASH_ENV=/opt/rh/gcc-toolset-12/enable \
20-
ENV=/opt/rh/gcc-toolset-12/enable \
21-
PROMPT_COMMAND=". /opt/rh/gcc-toolset-12/enable"
19+
ENV BASH_ENV=/opt/rh/gcc-toolset-14/enable \
20+
ENV=/opt/rh/gcc-toolset-14/enable \
21+
PROMPT_COMMAND=". /opt/rh/gcc-toolset-14/enable"

Dockerfile.qt

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
1-
ARG QT_VERSION=6.4.3
1+
ARG QT_VERSION=6.8.3
22

3-
FROM rockylinux/rockylinux:8 AS base
3+
FROM rockylinux/rockylinux:9 AS base
44

55
RUN dnf install -y epel-release && \
6-
dnf install --enablerepo=powertools -y \
7-
# Qt Requirement:
6+
dnf install --enablerepo=crb -y \
7+
# Qt Requirement:
88
alsa-lib \
99
ccache \
1010
cmake \
11-
# Qt Requirement:
11+
# Qt Requirement:
1212
cups-libs \
13-
gcc-toolset-12 \
14-
gcc-toolset-12-gcc-c++ \
13+
gcc-toolset-14 \
14+
gcc-toolset-14-gcc-c++ \
1515
file \
1616
git \
17-
# Qt Requirement:
17+
# Qt Requirement:
1818
fontconfig \
19-
# Qt Requirement:
19+
# Qt Requirement:
2020
libxkbcommon-x11 \
21-
# Qt Requirement:
21+
# Qt Requirement:
2222
libXcomposite-devel \
23-
# Qt Requirement:
23+
# Qt Requirement:
2424
libXcursor-devel \
25-
# Qt Requirement:
25+
# Qt Requirement:
2626
libXi-devel \
27-
# Qt Requirement:
27+
# Qt Requirement:
2828
libXrandr-devel \
29-
# Qt Requirement:
29+
# Qt Requirement:
3030
libXtst-devel \
31-
# Qt Requirement:
31+
# Qt Requirement:
3232
mesa-libGL-devel \
33-
# Qt Requirement:
33+
# Qt Requirement:
3434
mysql-libs \
35-
# Qt Requirement:
35+
# Qt Requirement:
3636
postgresql-odbc \
37-
# Qt Requirement:
37+
# Qt Requirement:
3838
xcb-util-cursor \
39-
# Qt Requirement:
39+
# Qt Requirement:
4040
xcb-util-image \
41-
# Qt Requirement:
41+
# Qt Requirement:
4242
xcb-util-keysyms \
43-
# Qt Requirement:
43+
# Qt Requirement:
4444
xcb-util-renderutil \
45-
# Qt Requirement:
45+
# Qt Requirement:
4646
xcb-util-wm \
4747
make \
4848
ninja-build \
4949
perl \
5050
unzip \
5151
zlib && dnf clean all -y && rm -rf /var/cache/dnf
52-
ENV BASH_ENV=/opt/rh/gcc-toolset-12/enable \
53-
ENV=/opt/rh/gcc-toolset-12/enable \
54-
PROMPT_COMMAND=". /opt/rh/gcc-toolset-12/enable"
52+
ENV BASH_ENV=/opt/rh/gcc-toolset-14/enable \
53+
ENV=/opt/rh/gcc-toolset-14/enable \
54+
PROMPT_COMMAND=". /opt/rh/gcc-toolset-14/enable"
5555

5656
FROM base AS extract
5757
ARG QT_VERSION
@@ -82,11 +82,11 @@ RUN chmod -R 755 /appimagetool
8282

8383
### Install Qt using aqt installer
8484
RUN dnf install -y \
85-
python39 \
86-
python39-devel \
87-
python39-pip && dnf clean all -y && rm -rf /var/cache/dnf
88-
RUN pip3.9 install -U setuptools wheel
89-
RUN source /opt/rh/gcc-toolset-12/enable && pip3.9 install aqtinstall
85+
python3.12 \
86+
python3.12-devel \
87+
python3.12-pip && dnf clean all -y && rm -rf /var/cache/dnf
88+
RUN pip3.12 install -U setuptools wheel
89+
RUN source /opt/rh/gcc-toolset-14/enable && pip3.12 install aqtinstall
9090
RUN aqt install-qt -O /qt linux desktop $QT_VERSION -m qtwebsockets
9191

9292
FROM base

0 commit comments

Comments
 (0)