Skip to content

Commit bfc660e

Browse files
joepvdjcaamano
authored andcommitted
Move sdn to RHEL9 base image
1 parent ad718a5 commit bfc660e

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-8-release-golang-1.21-openshift-4.16
4+
tag: rhel-9-release-golang-1.21-openshift-4.16

images/sdn/Dockerfile.rhel

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ COPY . .
1010
RUN make build --warn-undefined-variables
1111
RUN CGO_ENABLED=1 make build GO_BUILD_PACKAGES="github.com/openshift/sdn/cmd/openshift-sdn-cni" --warn-undefined-variables
1212

13-
FROM registry.ci.openshift.org/ocp/4.16:base
13+
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
1414

15-
ARG ovsver=2.13
16-
17-
RUN mkdir -p /opt/cni/bin/rhel9
18-
COPY --from=rhel9-builder /go/src/github.com/openshift/sdn/openshift-sdn-cni /opt/cni/bin/rhel9/openshift-sdn
15+
ARG ovsver=3.1
1916

2017
RUN mkdir -p /opt/cni/bin/rhel8
21-
COPY --from=rhel8-builder /go/src/github.com/openshift/sdn/openshift-sdn-node /usr/bin/
22-
COPY --from=rhel8-builder /go/src/github.com/openshift/sdn/openshift-sdn-controller /usr/bin/
23-
COPY --from=rhel8-builder /go/src/github.com/openshift/sdn/openshift-sdn-cni /opt/cni/bin/openshift-sdn
2418
COPY --from=rhel8-builder /go/src/github.com/openshift/sdn/openshift-sdn-cni /opt/cni/bin/rhel8/openshift-sdn
25-
COPY --from=rhel8-builder /go/src/github.com/openshift/sdn/host-local /usr/bin/cni/osdn-host-local
19+
20+
RUN mkdir -p /opt/cni/bin/rhel9
21+
COPY --from=rhel9-builder /go/src/github.com/openshift/sdn/openshift-sdn-node /usr/bin/
22+
COPY --from=rhel9-builder /go/src/github.com/openshift/sdn/openshift-sdn-controller /usr/bin/
23+
COPY --from=rhel9-builder /go/src/github.com/openshift/sdn/openshift-sdn-cni /opt/cni/bin/openshift-sdn
24+
COPY --from=rhel9-builder /go/src/github.com/openshift/sdn/openshift-sdn-cni /opt/cni/bin/rhel9/openshift-sdn
25+
COPY --from=rhel9-builder /go/src/github.com/openshift/sdn/host-local /usr/bin/cni/osdn-host-local
2626

2727
RUN INSTALL_PKGS=" \
2828
openvswitch${ovsver} container-selinux socat ethtool nmap-ncat \

0 commit comments

Comments
 (0)