Skip to content

Commit

Permalink
ci: Move Coverity from CentOS 8 to CentOS Stream 8, part 2
Browse files Browse the repository at this point in the history
Handle release "stream8" as "8" in Dockerfile templates.
  • Loading branch information
ppisar committed Feb 3, 2022
1 parent f405d4a commit 2d171d1
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .ci/centos/Dockerfile.deps.tmpl
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
dnl Coerce CentOS Stream image tags (streamN) to CentOS tags (N)
define(`cosrelease', patsubst(__RELEASE__, `stream', `'))dnl
FROM __IMAGE__

MAINTAINER Stephen Gallagher <[email protected]>

RUN yum -y install epel-release \
ifelse(eval(__RELEASE__ >= 8), 1, `dnl
ifelse(eval(cosrelease >= 8), 1, `dnl
&& yum -y install dnf-plugins-core \
&& yum config-manager --enable powertools \
')dnl
Expand All @@ -26,7 +28,7 @@ ifelse(eval(__RELEASE__ >= 8), 1, `dnl
pkgconfig \
python2-devel \
python2-six \
ifelse(eval(__RELEASE__ < 8), 1, `dnl
ifelse(eval(cosrelease < 8), 1, `dnl
python-gobject-base \
python36-gobject-base \
',`dnl
Expand Down

0 comments on commit 2d171d1

Please sign in to comment.