Add asio-devel to rpm based bb-worker images

Centos based have asio-devel in EPEL. SLES is omitted as it requires a subpackage module repository to be enabled. Doing so would increase the package dependencies when using the built packages. https://packagehub.suse.com/packages/asio/ (SLE-Module-PackageHub-Subpackages-Module ) OpenSUSE also has asio-devel but adds a complicated path in with the openssl libraries and boost that we'd be influcting on users if they used a non-bundled version. On RHEL - asio-devel in ubi9 EPEL but not 8.
MariaDB · Sep 30, 2024 · 140b3a3 · 140b3a3
1 parent 64d5aa7
commit 140b3a3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/ci_build_images/centos.Dockerfile b/ci_build_images/centos.Dockerfile
@@ -59,6 +59,7 @@ RUN dnf -y install 'dnf-command(config-manager)' \
     # not sure if needed \
     # perl \
     ${extra} \
+    asio-devel \
     bzip2 \
     bzip2-devel \
     ccache \

diff --git a/ci_build_images/fedora.Dockerfile b/ci_build_images/fedora.Dockerfile
@@ -19,6 +19,7 @@ RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf \
     && dnf -y builddep mariadb-server \
     && dnf -y install \
     @development-tools \
+    asio-devel \
     buildbot-worker \
     bzip2 \
     bzip2-devel \

diff --git a/ci_build_images/rhel.Dockerfile b/ci_build_images/rhel.Dockerfile
@@ -21,7 +21,7 @@ RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \
     && case $BASE_IMAGE in \
     ubi9) \
       v=9; \
-      extra="fmt-devel buildbot-worker"; \
+      extra="asio-devel buildbot-worker fmt-devel"; \
       ;; \
     ubi8) \
       v=8; \
-Original file line number
+Diff line change
@@ Expand Up @@
         && case $BASE_IMAGE in \
         ubi9) \
           v=9; \
-          extra="fmt-devel buildbot-worker"; \
+          extra="asio-devel buildbot-worker fmt-devel"; \
           ;; \
         ubi8) \
           v=8; \
@@ Expand Down @@