diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 38718883..1e59c02c 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-8-release-golang-1.21-openshift-4.16 + tag: rhel-9-release-golang-1.22-openshift-4.17 diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index ca32fb75..f8b7b132 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,11 +1,11 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder RUN yum install -y libvirt-devel WORKDIR /go/src/github.com/openshift/cluster-api-provider-libvirt COPY . . RUN go build -o machine-controller-manager ./cmd/manager -FROM registry.ci.openshift.org/ocp/4.16:base +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 RUN INSTALL_PKGS=" \ libvirt-libs openssh-clients xorriso \ " && \ diff --git a/go.mod b/go.mod index 8d1982d8..7acb5148 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/cluster-api-provider-libvirt -go 1.17 +go 1.22 require ( github.com/davecgh/go-spew v1.1.1