Skip to content

Commit c56b25b

Browse files
author
serverless-qe
committed
Generate dockerfiles with "make generate-release"
1 parent 868347b commit c56b25b

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

openshift/ci-operator/build-image/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# DO NOT EDIT! Generated Dockerfile.
22

3-
FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools
3+
FROM registry.ci.openshift.org/ocp/4.19:cli-artifacts as tools
44

55
# Dockerfile to bootstrap build and test in openshift-ci
6-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 as builder
6+
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 as builder
77

88
ARG TARGETARCH
99

10-
COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc
10+
COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel9 /usr/bin/oc
1111

1212
RUN ln -s /usr/bin/oc /usr/bin/kubectl
1313

14-
RUN yum install -y httpd-tools
14+
RUN dnf install -y httpd-tools
1515

1616
RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
1717
chmod 700 ./get-helm-3

openshift/ci-operator/knative-images/controller/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT EDIT! Generated Dockerfile for cmd/controller.
2-
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
3-
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
44

55
FROM $GO_BUILDER as builder
66

@@ -22,14 +22,15 @@ COPY LICENSE /licenses/
2222
USER 65532
2323

2424
LABEL \
25-
com.redhat.component="openshift-serverless-1-eventing-istio-controller-rhel8-container" \
26-
name="openshift-serverless-1/eventing-istio-controller-rhel8" \
25+
com.redhat.component="openshift-serverless-1-eventing-istio-controller-rhel9-container" \
26+
name="openshift-serverless-1/eventing-istio-controller-rhel9" \
2727
version=$VERSION \
2828
summary="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
2929
maintainer="[email protected]" \
3030
description="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
3131
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
3232
io.k8s.description="Red Hat OpenShift Serverless Eventing Istio Controller" \
33-
io.openshift.tags="controller"
33+
io.openshift.tags="controller" \
34+
cpe="cpe:/a:redhat:openshift_serverless:1.38::el9"
3435

3536
ENTRYPOINT ["/usr/bin/controller"]

0 commit comments

Comments
 (0)