Skip to content

OPRUN-3221: 🌱 fix xplat compile for of-tools image; hide utest files from git; use rhel8 art builder image #770

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
merged 1 commit into from
Jun 21, 2024
+7 −10
Merged

OPRUN-3221: 🌱 fix xplat compile for of-tools image; hide utest files from git; use rhel8 art builder image #770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Original file line number Diff line number Diff line change
@@ -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: 4 additions & 10 deletions operator-framework-tools.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
# Update when available: registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.17 AS builder-rhel8
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17 AS builder-rhel8
ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
WORKDIR /src
COPY . .
# Remove after updating to rhel-8-golang-1.22-openshift-4.17
# Install golang 1.22.2
RUN go install -mod=mod golang.org/dl/go1.22.2@latest
RUN go1.22.2 download
RUN ln -s /go/bin/go1.22.2 /go/bin/go
# Now we can make registry
RUN make build/registry cross

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

FROM scratch

# 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