From 140b3a30beed84a082fe387a881618ac6255b638 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Mon, 30 Sep 2024 12:19:46 +1000 Subject: [PATCH] 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. --- ci_build_images/centos.Dockerfile | 1 + ci_build_images/fedora.Dockerfile | 1 + ci_build_images/rhel.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ci_build_images/centos.Dockerfile b/ci_build_images/centos.Dockerfile index 1a92eb6a..489799c4 100644 --- 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 index d6387144..8431b304 100644 --- 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 index f24562b8..d3415b21 100644 --- 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; \