forked from openshift/cluster-logging-operator
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathDockerfile.centos.patch
29 lines (24 loc) · 1.12 KB
/
Dockerfile.centos.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
diff --git a/Dockerfile b/Dockerfile.local
index 9212266f..489ce024 100644
--- a/Dockerfile
+++ b/Dockerfile.local
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.15 as builder
WORKDIR /go/src/github.com/openshift/cluster-logging-operator
# COPY steps are in the reverse order of frequency of change
@@ -17,9 +17,7 @@ COPY pkg ./pkg
RUN make build
-FROM registry.ci.openshift.org/ocp/4.7:cli as origincli
-
-FROM registry.ci.openshift.org/ocp/4.7:base
+FROM centos:centos8 AS centos
RUN INSTALL_PKGS=" \
openssl \
file \
@@ -40,7 +38,6 @@ COPY --from=builder /go/src/github.com/openshift/cluster-logging-operator/files/
COPY --from=builder /go/src/github.com/openshift/cluster-logging-operator/manifests /manifests
RUN rm /manifests/art.yaml
-COPY --from=origincli /usr/bin/oc /usr/bin/
COPY --from=builder /go/src/github.com/openshift/cluster-logging-operator/must-gather/collection-scripts/* /usr/bin/
# this is required because the operator invokes a script as `bash scripts/cert_generation.sh`