Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ci_build_images/centos.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,14 @@ RUN dnf -y install 'dnf-command(config-manager)' \
&& if [ "$PLATFORM_ID" = "platform:el9" ]; then \
dnf -y install \
buildbot-worker \
mysql-selinux \
; \
fi \
&& if [ "$PLATFORM_ID" = "platform:el10" ]; then \
dnf -y install \
java-21-openjdk-devel \
java-21-openjdk ; \
java-21-openjdk \
mysql-selinux ; \
else \
dnf -y install \
java-1.8.0-openjdk-devel \
Expand Down
3 changes: 3 additions & 0 deletions ci_build_images/fedora.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf \
else \
dnf -y install java-1.8.0-openjdk-devel java-1.8.0-openjdk; \
fi \
&& if [ "$VERSION_ID" != "40" ]; then \
dnf -y install mysql-selinux; \
fi \
&& if [ "$(uname -m)" = "x86_64" ]; then dnf -y install libpmem-devel; fi \
&& if [ "$INSTALL_VALGRIND" = "true" ]; then dnf -y install valgrind; fi \
&& dnf clean all
Expand Down
4 changes: 2 additions & 2 deletions ci_build_images/rhel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \
&& case $BASE_IMAGE in \
ubi10) \
v=10; \
extra="asio-devel fmt-devel java-latest-openjdk-devel java-latest-openjdk liburing-devel"; \
extra="asio-devel fmt-devel java-latest-openjdk-devel java-latest-openjdk liburing-devel mysql-selinux"; \
;; \
ubi9) \
v=9; \
extra="asio-devel buildbot-worker fmt-devel java-1.8.0-openjdk-devel java-1.8.0-openjdk liburing-devel"; \
extra="asio-devel buildbot-worker fmt-devel java-1.8.0-openjdk-devel java-1.8.0-openjdk liburing-devel mysql-selinux"; \
;; \
ubi8) \
v=8; \
Expand Down