Merge pull request kubernetes-csi#10 from jsafrane/4.2-fixes

Adjustments for OpenShift 4.2
jsafrane · Jun 10, 2019 · d87aa29 · d87aa29
2 parents 1ee3289 + bd7d936
commit d87aa29
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Dockerfile.openshift b/Dockerfile.openshift
@@ -1,10 +1,10 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.11 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/livenessprobe
 COPY . .
-RUN go build -o livenessprobe ./cmd/livenessprobe
+RUN make build
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
-COPY --from=builder /go/src/github.com/kubernetes-csi/livenessprobe/livenessprobe /usr/bin/
+COPY --from=builder /go/src/github.com/kubernetes-csi/livenessprobe/bin/livenessprobe /usr/bin/
 RUN useradd livenessprobe
 USER livenessprobe
 ENTRYPOINT ["/usr/bin/livenessprobe"]
diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7
@@ -1,10 +1,10 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/livenessprobe
 COPY . .
-RUN go build -o livenessprobe ./cmd/livenessprobe
+RUN make build
 
 FROM registry.svc.ci.openshift.org/ocp/4.0:base
-COPY --from=builder /go/src/github.com/kubernetes-csi/livenessprobe/livenessprobe /usr/bin/
+COPY --from=builder /go/src/github.com/kubernetes-csi/livenessprobe/bin/livenessprobe /usr/bin/
 RUN useradd livenessprobe
 USER livenessprobe
 ENTRYPOINT ["/usr/bin/livenessprobe"]
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -3,6 +3,5 @@ aliases:
     - jsafrane
     - tsmetana
     - gnufied
-    - wongma7
     - childsb
     - bertinatto