Merge pull request #67 from vikaschoudhary16/dev

Drop x-operator and integrate with cvo, following pattern from machine-config-operator
openshift · Sep 21, 2018 · a67b759 · a67b759
2 parents 42fb5ab + 7e71bbe
commit a67b759
Show file tree

Hide file tree

Showing 914 changed files with 77,565 additions and 39,933 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,6 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o bin/machine-api-operator -a -ldflags '-
 
 # Final container
 FROM openshift/origin-base
-RUN yum install -y ca-certificates
 
 COPY --from=build /go/src/github.com/openshift/machine-api-operator/bin/machine-api-operator .
 COPY --from=build /go/src/github.com/openshift/machine-api-operator/manifests manifests