Skip to content

Commit afc873a

Browse files
authored
ci: fix demo-rockylinux-9 builds (#10481)
Installing `curl` conflicts with a pre-installed `curl-minimal` package. It seems that `curl-minimal` is all we need.
1 parent 2adbc17 commit afc873a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN dnf makecache && \
2525
dnf update -y && \
2626
dnf install -y epel-release && \
2727
dnf makecache && \
28-
dnf install -y ccache cmake curl findutils gcc-c++ git make openssl-devel \
28+
dnf install -y ccache cmake findutils gcc-c++ git make openssl-devel \
2929
patch re2-devel zlib-devel libcurl-devel c-ares-devel tar wget which
3030
# ```
3131

doc/packaging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,7 @@ sudo dnf makecache && \
15131513
sudo dnf update -y && \
15141514
sudo dnf install -y epel-release && \
15151515
sudo dnf makecache && \
1516-
sudo dnf install -y ccache cmake curl findutils gcc-c++ git make openssl-devel \
1516+
sudo dnf install -y ccache cmake findutils gcc-c++ git make openssl-devel \
15171517
patch re2-devel zlib-devel libcurl-devel c-ares-devel tar wget which
15181518
```
15191519

0 commit comments

Comments
 (0)