Skip to content

Commit b29ba37

Browse files
committed
UPSTREAM: <carry>: fix xplat compile for of-tools image; hide utest files from git; use rhel8 art builder image
Signed-off-by: Jordan Keister <[email protected]>
1 parent 66ef61a commit b29ba37

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,3 +468,6 @@ scripts/**/*.crc.e2e.patch.yaml
468468

469469
# downstream sync sha files
470470
*.cherrypick
471+
472+
# unit test artifacts
473+
vendor/github.com/operator-framework/operator-registry/pkg/lib/indexer/index.Dockerfile*

operator-framework-tools.Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ RUN make build/registry cross
1414

1515
FROM scratch
1616

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

2122
# copy the dynamically-linked versions to /tools with a -rhel8 suffix
2223
COPY --from=builder-rhel8 /src/bin/opm /tools/opm-rhel8

0 commit comments

Comments
 (0)