Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion openshift/operator-controller.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
WORKDIR /build
COPY . .
RUN make go-build-local
RUN make go-build-local && \
# Build the OLMv1 Test Extension binary.
# This is used by openshift/origin to allow us to register the OLMv1 test extension
# The binary needs to be added in the component image and OCP image
cd openshift/tests-extension && \
make build && \
mkdir -p /tmp/build && \
cp ./bin/olmv1-tests-ext /tmp/build/olmv1-tests-ext && \
gzip -f /tmp/build/olmv1-tests-ext

FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
USER 1001
COPY --from=builder /build/bin/operator-controller /operator-controller
COPY --from=builder /tmp/build/olmv1-tests-ext.gz /usr/bin/olmv1-tests-ext.gz
COPY openshift/operator-controller/cp-manifests /cp-manifests
COPY openshift/operator-controller/manifests /openshift/manifests
COPY openshift/operator-controller/manifests-experimental /openshift/manifests-experimental
Expand Down
20 changes: 0 additions & 20 deletions openshift/tests-extension/Dockerfile

This file was deleted.