openshift · deads2k · Jul 17, 2019 · Jul 17, 2019 · Jul 17, 2019
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,10 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
-WORKDIR /go/src/github.com/openshift/origin
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
+WORKDIR /go/src/github.com/openshift/openshift-controller-manager
 COPY . .
-RUN make build WHAT=vendor/github.com/openshift/openshift-controller-manager/cmd/openshift-controller-manager; \
-    mkdir -p /tmp/build; \
-    cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/openshift-controller-manager /tmp/build/openshift-controller-manager
+RUN make build --warn-undefined-variables
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
-COPY --from=builder /tmp/build/openshift-controller-manager /usr/bin/
+COPY --from=builder /go/src/github.com/openshift/openshift-controller-manager/openshift-controller-manager /usr/bin/
 LABEL io.k8s.display-name="OpenShift Controller Manager Command" \
       io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
       io.openshift.tags="openshift,openshift-controller-manager"
diff --git a/Dockerfile.rhel b/Dockerfile.rhel
@@ -1,12 +1,10 @@
 FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
-WORKDIR /go/src/github.com/openshift/origin
+WORKDIR /go/src/github.com/openshift/openshift-controller-manager
 COPY . .
-RUN make build WHAT=vendor/github.com/openshift/openshift-controller-manager/cmd/openshift-controller-manager; \
-    mkdir -p /tmp/build; \
-    cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/openshift-controller-manager /tmp/build/openshift-controller-manager
+RUN make build --warn-undefined-variables
 
 FROM registry.svc.ci.openshift.org/ocp/4.2:base
-COPY --from=builder /tmp/build/openshift-controller-manager /usr/bin/
+COPY --from=builder /go/src/github.com/openshift/openshift-controller-manager/openshift-controller-manager /usr/bin/
 LABEL io.k8s.display-name="OpenShift Controller Manager Command" \
       io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
       io.openshift.tags="openshift,openshift-controller-manager"
diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/malevolent-certs/ca.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/malevolent-certs/ca.pem
diff --git a/...or/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+ca.pem b/...or/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+ca.pem
diff --git a/....com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+client-cert.pem b/....com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+client-cert.pem
diff --git a/...b.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+client-key.pem b/...b.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+client-key.pem
diff --git a/...m/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localhost-cert.pem b/...m/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localhost-cert.pem
diff --git a/...om/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localhost-key.pem b/...om/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localhost-key.pem
diff --git a/...cker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localregistry-cert.pem b/...cker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localregistry-cert.pem
diff --git a/...ocker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localregistry-key.pem b/...ocker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localregistry-key.pem
diff --git a/...om/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+client-cert.pem b/...om/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+client-cert.pem
diff --git a/...com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+client-key.pem b/...com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+client-key.pem
diff --git a/...docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localhost-cert.pem b/...docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localhost-cert.pem
diff --git a/.../docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localhost-key.pem b/.../docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localhost-key.pem
diff --git a/...er/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localregistry-cert.pem b/...er/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localregistry-cert.pem