Skip to content

Commit

Permalink
Merge pull request #128 from tholok97/tholok97-fix-dockerfiles
Browse files Browse the repository at this point in the history
Fixed build step in Dockerfiles
  • Loading branch information
garethr committed May 27, 2019
2 parents 23a2770 + a82d268 commit 0569843
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ FROM golang:1.12-alpine as builder
RUN apk --no-cache add make git
WORKDIR /
COPY . /
RUN make linux
RUN make build

FROM alpine:latest
RUN apk --no-cache add ca-certificates
COPY --from=builder /bin/linux/amd64/kubeval .
COPY --from=builder /bin/kubeval .
RUN ln -s /kubeval /usr/local/bin/kubeval
ENTRYPOINT ["/kubeval"]
CMD ["--help"]
2 changes: 1 addition & 1 deletion Dockerfile.acceptance
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN make build

FROM bats/bats:v1.1.0
RUN apk --no-cache add ca-certificates
COPY --from=builder /bin/linux/amd64/kubeval /usr/local/bin
COPY --from=builder /bin/kubeval /usr/local/bin
COPY acceptance.bats /acceptance.bats
COPY fixtures /fixtures
RUN "/acceptance.bats"
4 changes: 2 additions & 2 deletions Dockerfile.offline
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM golang:1.12-alpine as builder
RUN apk --no-cache add make git
WORKDIR /
COPY . /
RUN make linux
RUN make build

FROM alpine:latest as schemas
RUN apk --no-cache add git
Expand All @@ -15,7 +15,7 @@ RUN cd kubernetes-json-schema/master && \

FROM alpine:latest
RUN apk --no-cache add ca-certificates
COPY --from=builder /bin/linux/amd64/kubeval .
COPY --from=builder /bin/kubeval .
COPY --from=standalone-schemas /kubernetes-json-schema /schemas/kubernetes-json-schema/master
COPY --from=standalone-schemas /openshift-json-schema /schemas/openshift-json-schema/master
ENV KUBEVAL_SCHEMA_LOCATION=file:///schemas
Expand Down

0 comments on commit 0569843

Please sign in to comment.