Skip to content

Commit

Permalink
Add asio-devel to rpm based bb-worker images
Browse files Browse the repository at this point in the history
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 )

On RHEL - asio-devel in ubi9 EPEL but not 8.
  • Loading branch information
grooverdan committed Sep 30, 2024
1 parent 64d5aa7 commit c67d3b3
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions ci_build_images/centos.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ RUN dnf -y install 'dnf-command(config-manager)' \
# not sure if needed \
# perl \
${extra} \
asio-devel \
bzip2 \
bzip2-devel \
ccache \
Expand Down
1 change: 1 addition & 0 deletions ci_build_images/fedora.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions ci_build_images/opensuse.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RUN zypper update -y \
&& if [ "$ARCH" = x86_64 ]; then ARCH=amd64 ; fi \
&& zypper addrepo https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-"${ARCH}-${ID%%-leap}-${VERSION_ID}".repo \
&& zypper install -y \
asio-devel \
bzip2 \
ccache \
check-devel \
Expand Down
2 changes: 1 addition & 1 deletion ci_build_images/rhel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down

0 comments on commit c67d3b3

Please sign in to comment.