Merge pull request #2134 from benluddy/cleanup-downstream-cruft

Remove OpenShift-specific Dockerfiles.

Author: openshift-merge-robot

.github/workflows/test-scripts.yml

@@ -17,7 +17,7 @@ jobs:
       uses: docker/build-push-action@v1
       with:
         repository: operator-framework/olm
-        dockerfile: ./upstream.Dockerfile
+        dockerfile: ./Dockerfile
         push: false
   run-local-minikube:
     runs-on: ubuntu-latest

Dockerfile

@@ -1,56 +1,36 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8 AS builder
-
-ENV GO111MODULE auto
-ENV GOPATH /go
-ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
-
+FROM quay.io/fedora/fedora:34-x86_64 as builder
+LABEL stage=builder
 WORKDIR /build
 
+# install dependencies and go 1.16
+
 # copy just enough of the git repo to parse HEAD, used to record version in OLM binaries
+RUN dnf update -y && dnf install -y bash make git mercurial jq wget golang && dnf upgrade -y
 COPY .git/HEAD .git/HEAD
 COPY .git/refs/heads/. .git/refs/heads
 RUN mkdir -p .git/objects
-
 COPY Makefile Makefile
 COPY OLM_VERSION OLM_VERSION
 COPY pkg pkg
 COPY vendor vendor
+COPY go.mod go.mod
+COPY go.sum go.sum
 COPY cmd cmd
 COPY util util
 COPY test test
-COPY go.mod go.mod
-COPY go.sum go.sum
-RUN CGO_ENABLED=1 make build
+RUN CGO_ENABLED=0 make build
 RUN make build-util
 
-FROM registry.ci.openshift.org/ocp/4.8:base
-
-ADD manifests/ /manifests
-LABEL io.openshift.release.operator=true
-
-# Copy the binary to a standard location where it will run.
+# use debug tag to keep a shell around for backwards compatibility with the previous alpine image
+FROM gcr.io/distroless/static:debug
+LABEL stage=olm
+WORKDIR /
+# bundle unpack Jobs require cp at /bin/cp
+RUN ["/busybox/ln", "-s", "/busybox/cp", "/bin/cp"]
 COPY --from=builder /build/bin/olm /bin/olm
 COPY --from=builder /build/bin/catalog /bin/catalog
 COPY --from=builder /build/bin/package-server /bin/package-server
 COPY --from=builder /build/bin/cpb /bin/cpb
-
-# This image doesn't need to run as root user.
-USER 1001
-
 EXPOSE 8080
 EXPOSE 5443
-
-# Apply labels as needed. ART build automation fills in others required for
-# shipping, including component NVR (name-version-release) and image name. OSBS
-# applies others at build time. So most required labels need not be in the source.
-#
-# io.k8s.display-name is required and is displayed in certain places in the
-# console (someone correct this if that's no longer the case)
-#
-# io.k8s.description is equivalent to "description" and should be defined per
-# image; otherwise the parent image's description is inherited which is
-# confusing at best when examining images.
-#
-LABEL io.k8s.display-name="OpenShift Operator Lifecycle Manager" \
-      io.k8s.description="This is a component of OpenShift Container Platform and manages the lifecycle of operators." \
-      maintainer="Odin Team <[email protected]>"
+CMD ["/bin/olm"]