Skip to content

Commit 893b225

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 092123a commit 893b225

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

.gitignore

+3
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

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
1-
# Update when available: registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
2-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.17 AS builder-rhel8
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17 AS builder-rhel8
32
ENV GOPATH /go
43
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
54
WORKDIR /src
65
COPY . .
7-
# Remove after updating to rhel-8-golang-1.22-openshift-4.17
8-
# Install golang 1.22.2
9-
RUN go install -mod=mod golang.org/dl/go1.22.2@latest
10-
RUN go1.22.2 download
11-
RUN ln -s /go/bin/go1.22.2 /go/bin/go
12-
# Now we can make registry
136
RUN make build/registry cross
147

158
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
@@ -21,9 +14,10 @@ RUN make build/registry cross
2114

2215
FROM scratch
2316

17+
# copy a rhel-specific instance
2418
COPY --from=builder /src/bin/opm /tools/opm-rhel9
25-
COPY --from=builder /src/bin/darwin-amd64-opm /tools/darwin-amd64-opm
26-
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/
2721

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

0 commit comments

Comments
 (0)