Switch to go modules and simplify Makefile

openshift · Mar 25, 2020 · c660202 · c660202
1 parent f57b065
commit c660202
Show file tree

Hide file tree

Showing 7,616 changed files with 51,904 additions and 4,315,651 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,11 @@
+# Bin output
+bin/*
 
 # Temporary Build Files
 tmp/_output
 tmp/_test
 _output
+pf.log
 
 # GoLand
 .idea
@@ -110,3 +113,4 @@ tags
 
 
 # End of https://www.gitignore.io/api/go,vim,emacs,visualstudiocode
+/.zz_generate_timestamp
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
 WORKDIR /go/src/github.com/openshift/elasticsearch-operator
 COPY . .
 RUN make
@@ -8,7 +8,7 @@ FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 ENV ALERTS_FILE_PATH="/etc/elasticsearch-operator/files/prometheus_alerts.yml"
 ENV RULES_FILE_PATH="/etc/elasticsearch-operator/files/prometheus_rules.yml"
 
-COPY --from=builder /go/src/github.com/openshift/elasticsearch-operator/_output/bin/elasticsearch-operator /usr/bin/
+COPY --from=builder /go/src/github.com/openshift/elasticsearch-operator/bin/elasticsearch-operator /usr/bin/
 COPY --from=builder /go/src/github.com/openshift/elasticsearch-operator/files/ /etc/elasticsearch-operator/files/
 COPY --from=builder /go/src/github.com/openshift/elasticsearch-operator/manifests /manifests
 RUN rm /manifests/art.yaml