File tree 2 files changed +7
-10
lines changed
2 files changed +7
-10
lines changed Original file line number Diff line number Diff line change @@ -468,3 +468,6 @@ scripts/**/*.crc.e2e.patch.yaml
468
468
469
469
# downstream sync sha files
470
470
* .cherrypick
471
+
472
+ # unit test artifacts
473
+ vendor /github.com /operator-framework /operator-registry /pkg /lib /indexer /index.Dockerfile *
Original file line number Diff line number Diff line change 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
3
2
ENV GOPATH /go
4
3
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
5
4
WORKDIR /src
6
5
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
13
6
RUN make build/registry cross
14
7
15
8
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
21
14
22
15
FROM scratch
23
16
17
+ # copy a rhel-specific instance
24
18
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/
27
21
28
22
# copy the dynamically-linked versions to /tools with a -rhel8 suffix
29
23
COPY --from=builder-rhel8 /src/bin/opm /tools/opm-rhel8
You can’t perform that action at this time.
0 commit comments