-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci: Move Coverity from CentOS 8 to CentOS Stream 8, part 2
Handle release "stream8" as "8" in Dockerfile templates.
- Loading branch information
Showing
1 changed file
with
4 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
@@ -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 | ||
|