Skip to content

Commit 978b239

Browse files
committed
Update Dockerfile to work on CentOS/RHEL 10
1 parent d27b803 commit 978b239

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

addons/redhat/Dockerfile.ocp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ RUN make clean && make
66

77
FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
88

9-
RUN yum -y update && yum -y update glibc && yum --setopt=skip_missing_names_on_install=False -y \
9+
# gpsd-minimal and gpsd-minimal-clients are no longer in RHEL 10
10+
# remove when base image is upgraded to RHEL 10
11+
RUN if yum install -y gpsd-minimal gpsd-minimal-clients >/dev/null 2>&1; then GPSD_PKGS="gpsd-minimal gpsd-minimal-clients"; else GPSD_PKGS="gpsd"; fi && \
12+
yum -y update && yum -y update glibc && yum --setopt=skip_missing_names_on_install=False -y \
1013
install \
1114
pciutils \
1215
linuxptp \
@@ -16,8 +19,7 @@ RUN yum -y update && yum -y update glibc && yum --setopt=skip_missing_names_on_i
1619
iproute \
1720
procps-ng \
1821
chrony \
19-
gpsd-minimal \
20-
gpsd-minimal-clients \
22+
$GPSD_PKGS \
2123
&& yum clean all
2224

2325
# Create symlinks for executables to match references

0 commit comments

Comments
 (0)