-
Notifications
You must be signed in to change notification settings - Fork 147
/
Dockerfile.centos.patch
32 lines (27 loc) · 1.15 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
30
31
32
diff --git a/Dockerfile b/Dockerfile.local
index 3a538899..01197257 100644
--- a/Dockerfile
+++ b/Dockerfile.local
@@ -1,6 +1,5 @@
### This is a generated file from Dockerfile.in ###
-#@follow_tag(openshift-golang-builder:1.14)
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8 AS builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.16 as builder
ENV BUILD_VERSION=${CI_CONTAINER_VERSION}
ENV OS_GIT_MAJOR=${CI_X_VERSION}
ENV OS_GIT_MINOR=${CI_Y_VERSION}
RUN make build
-#@follow_tag(openshift-ose-cli:v4.6)
-FROM registry.ci.openshift.org/ocp/4.8:cli AS origincli
-
-#@follow_tag(openshift-ose-base:ubi8)
-FROM registry.ci.openshift.org/ocp/4.8:base
+FROM centos:centos8 AS centos
RUN INSTALL_PKGS=" \
openssl \
rsync \
@@ -53,7 +48,6 @@ COPY --from=builder /go/src/github.com/openshift/cluster-logging-operator/manife
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`