Skip to content

[release-4.16] OCPBUGS-25019: fix xplat compile for of-tools image; hide utest files from git; use rhel8 art builder image #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 5 commits into from
Jul 9, 2024
Merged

[release-4.16] OCPBUGS-25019: fix xplat compile for of-tools image; hide utest files from git; use rhel8 art builder image #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b29ba37
UPSTREAM: <carry>: fix xplat compile for of-tools image; hide utest f…
grokspawn Jun 7, 2024
ea1b943
switch base image
grokspawn Jun 27, 2024
345509b
don't erase the filesystem from the base
grokspawn Jul 1, 2024
dfa5e45
Update operator-framework-tools.Dockerfile
Ximinhan Jul 3, 2024
6e9c9e8
Update operator-framework-tools.Dockerfile
Ximinhan Jul 3, 2024
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,3 +468,6 @@ scripts/**/*.crc.e2e.patch.yaml

# downstream sync sha files
*.cherrypick

# unit test artifacts
vendor/github.com/operator-framework/operator-registry/pkg/lib/indexer/index.Dockerfile*
14 changes: 10 additions & 4 deletions operator-framework-tools.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,15 @@ WORKDIR /src
COPY . .
RUN make build/registry cross

FROM scratch
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
ENTRYPOINT ["sh", "-c", "echo 'Running this image is not supported' && exit 1"]
# clear any default CMD
CMD []

# copy a rhel-specific instance
COPY --from=builder /src/bin/opm /tools/opm-rhel9
COPY --from=builder /src/bin/darwin-amd64-opm /tools/darwin-amd64-opm
COPY --from=builder /src/bin/windows-amd64-opm /tools/windows-amd64-opm
# copy all other generated binaries, including any cross-compiled
COPY --from=builder /src/bin/*opm /tools/

# copy the dynamically-linked versions to /tools with a -rhel8 suffix
COPY --from=builder-rhel8 /src/bin/opm /tools/opm-rhel8
Expand All @@ -25,4 +29,6 @@ USER 1001

LABEL io.k8s.display-name="OpenShift Operator Framework Tools" \
io.k8s.description="This is a non-runnable image containing binary builds of various Operator Framework tools, primarily used to publish binaries to the OpenShift mirror." \
maintainer="Odin Team <aos-odin@redhat.com>"
maintainer="Odin Team <aos-odin@redhat.com>" \
# We're not really an operator, we're just getting some data into the release image.
io.openshift.release.operator=true