Skip to content

Commit 7d4112c

Browse files
Merge pull request kubernetes-csi#3 from smarterclayton/rhel7
ADd a RHEL7 dockerfile and standardize format
2 parents 6a4e22e + fe8e7b2 commit 7d4112c

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

Dockerfile.openshift

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
FROM openshift/origin-release:golang-1.10
2-
COPY . /go/src/github.com/kubernetes-csi/livenessprobe/
3-
RUN cd /go/src/github.com/kubernetes-csi/livenessprobe/ && \
4-
go build -o livenessprobe ./cmd
5-
6-
FROM centos:7
7-
8-
COPY --from=0 /go/src/github.com/kubernetes-csi/livenessprobe/livenessprobe /usr/bin/
1+
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
2+
WORKDIR /go/src/github.com/kubernetes-csi/livenessprobe
3+
COPY . .
4+
RUN go build -o livenessprobe ./cmd
95

6+
FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
7+
COPY --from=builder /go/src/github.com/kubernetes-csi/livenessprobe/livenessprobe /usr/bin/
108
RUN useradd livenessprobe
119
USER livenessprobe
12-
1310
ENTRYPOINT ["/usr/bin/livenessprobe"]

Dockerfile.openshift.rhel7

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
2+
WORKDIR /go/src/github.com/kubernetes-csi/livenessprobe
3+
COPY . .
4+
RUN go build -o livenessprobe ./cmd
5+
6+
FROM registry.svc.ci.openshift.org/ocp/4.0:base
7+
COPY --from=builder /go/src/github.com/kubernetes-csi/livenessprobe/livenessprobe /usr/bin/
8+
RUN useradd livenessprobe
9+
USER livenessprobe
10+
ENTRYPOINT ["/usr/bin/livenessprobe"]

0 commit comments

Comments
 (0)