Skip to content

Commit b3cd155

Browse files
committed
build oc tools from source to fix 4.18 CVEs
Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>
1 parent ee29268 commit b3cd155

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

Dockerfile.downstream

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,16 @@ ARG IMAGE=registry.redhat.io/network-observability/network-observability-ebpf-ag
55
ARG AGENT_IMAGE=registry.redhat.io/network-observability/network-observability-ebpf-agent-rhel9:1.8
66

77
# Make kubectl & oc scripts available for copy
8-
FROM registry.redhat.io/openshift4/ose-cli-rhel9:v4.18.0-202502040032.p0.ga50d4c0.assembly.stream.el9 as ose-cli
8+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23 as ose-cli
9+
ARG TARGETARCH
10+
WORKDIR /usr/src/ose-cli
11+
ARG OC_REPO_URL=https://github.com/openshift/oc
12+
ARG OC_REPO_BRANCH=master
13+
14+
RUN git clone --depth 1 --branch $OC_REPO_BRANCH $OC_REPO_URL .
15+
16+
# Build
17+
RUN GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} VERSION="latest" make oc
918

1019
# Build the manager binary
1120
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23 as builder
@@ -61,4 +70,5 @@ LABEL maintainer="support@redhat.com"
6170
LABEL io.openshift.tags="network-observability-cli"
6271
LABEL upstream-vcs-type="git"
6372
LABEL upstream-vcs-ref=$COMMIT
73+
LABEL description="network-observability-cli is a lightweight Flow, Packet and Metrics visualization tool."
6474
LABEL version=$BUILDVERSION

0 commit comments

Comments
 (0)