Skip to content

Commit 3cc3d77

Browse files
MDBF-1128 - Install mysql-selinux
Now required as per server change https://github.com/MariaDB/server/pull/4308/files
1 parent 85f63ee commit 3cc3d77

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

ci_build_images/centos.Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,14 @@ RUN dnf -y install 'dnf-command(config-manager)' \
9797
&& if [ "$PLATFORM_ID" = "platform:el9" ]; then \
9898
dnf -y install \
9999
buildbot-worker \
100+
mysql-selinux \
100101
; \
101102
fi \
102103
&& if [ "$PLATFORM_ID" = "platform:el10" ]; then \
103104
dnf -y install \
104105
java-21-openjdk-devel \
105-
java-21-openjdk ; \
106+
java-21-openjdk \
107+
mysql-selinux ; \
106108
else \
107109
dnf -y install \
108110
java-1.8.0-openjdk-devel \

ci_build_images/fedora.Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf \
6666
else \
6767
dnf -y install java-1.8.0-openjdk-devel java-1.8.0-openjdk; \
6868
fi \
69+
&& if [ "$VERSION_ID" != "40" ]; then \
70+
dnf -y install mysql-selinux; \
71+
fi \
6972
&& if [ "$(uname -m)" = "x86_64" ]; then dnf -y install libpmem-devel; fi \
7073
&& if [ "$INSTALL_VALGRIND" = "true" ]; then dnf -y install valgrind; fi \
7174
&& dnf clean all

ci_build_images/rhel.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \
2121
&& case $BASE_IMAGE in \
2222
ubi10) \
2323
v=10; \
24-
extra="asio-devel fmt-devel java-latest-openjdk-devel java-latest-openjdk liburing-devel"; \
24+
extra="asio-devel fmt-devel java-latest-openjdk-devel java-latest-openjdk liburing-devel mysql-selinux"; \
2525
;; \
2626
ubi9) \
2727
v=9; \
28-
extra="asio-devel buildbot-worker fmt-devel java-1.8.0-openjdk-devel java-1.8.0-openjdk liburing-devel"; \
28+
extra="asio-devel buildbot-worker fmt-devel java-1.8.0-openjdk-devel java-1.8.0-openjdk liburing-devel mysql-selinux"; \
2929
;; \
3030
ubi8) \
3131
v=8; \

0 commit comments

Comments
 (0)