diff --git a/Dockerfile b/Dockerfile index e5001a3..a79a450 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,9 @@ -FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 +ARG BASE_IMAGE='registry.ci.openshift.org/ocp/4.22:base-rhel9' +FROM ${BASE_IMAGE} ARG KERNEL_VERSION='' ARG RT_KERNEL_VERSION='' ARG RHEL_VERSION='' +ARG RHEL_STREAM='rhel-9' # If RHEL_VERSION is empty, we infer it from the /etc/os-release file. This is used by OKD as we always want the latest one. RUN [ "${RHEL_VERSION}" == "" ] && source /etc/os-release && RHEL_VERSION=${VERSION_ID}; echo ${RHEL_VERSION} > /etc/dnf/vars/releasever \ && dnf config-manager --best --setopt=install_weak_deps=False --save @@ -66,7 +68,10 @@ RUN if echo "${TAGS:-}" | grep -q scos > /dev/null 2>&1; then sed -i 's/rhel-cor LABEL io.k8s.description="driver-toolkit is a container with the kernel packages necessary for building driver containers for deploying kernel modules/drivers on OpenShift" \ name="driver-toolkit" \ io.openshift.release.operator=true \ - version="0.1" + version="0.1" \ + io.openshift.os.streamclass=${RHEL_STREAM} \ + kernel-version=${KERNEL_VERSION} \ + kernel-rt-version=${RT_KERNEL_VERSION} # Last layer for metadata for mapping the driver-toolkit to a specific kernel version RUN export INSTALLED_KERNEL=$(rpm -q --qf "%{VERSION}-%{RELEASE}.%{ARCH}" kernel-devel); \ diff --git a/manifests/image-references b/manifests/image-references index 8b12c3b..ded245b 100644 --- a/manifests/image-references +++ b/manifests/image-references @@ -10,3 +10,7 @@ spec: from: kind: DockerImage name: example.com/image-reference-placeholder:rhel-coreos + - name: rhel-coreos-10 + from: + kind: DockerImage + name: example.com/image-reference-placeholder:rhel-coreos-10