Skip to content

Commit 0569843

Browse files
authored
Merge pull request #128 from tholok97/tholok97-fix-dockerfiles
Fixed build step in Dockerfiles
2 parents 23a2770 + a82d268 commit 0569843

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ FROM golang:1.12-alpine as builder
22
RUN apk --no-cache add make git
33
WORKDIR /
44
COPY . /
5-
RUN make linux
5+
RUN make build
66

77
FROM alpine:latest
88
RUN apk --no-cache add ca-certificates
9-
COPY --from=builder /bin/linux/amd64/kubeval .
9+
COPY --from=builder /bin/kubeval .
1010
RUN ln -s /kubeval /usr/local/bin/kubeval
1111
ENTRYPOINT ["/kubeval"]
1212
CMD ["--help"]

Dockerfile.acceptance

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN make build
66

77
FROM bats/bats:v1.1.0
88
RUN apk --no-cache add ca-certificates
9-
COPY --from=builder /bin/linux/amd64/kubeval /usr/local/bin
9+
COPY --from=builder /bin/kubeval /usr/local/bin
1010
COPY acceptance.bats /acceptance.bats
1111
COPY fixtures /fixtures
1212
RUN "/acceptance.bats"

Dockerfile.offline

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM golang:1.12-alpine as builder
22
RUN apk --no-cache add make git
33
WORKDIR /
44
COPY . /
5-
RUN make linux
5+
RUN make build
66

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

1616
FROM alpine:latest
1717
RUN apk --no-cache add ca-certificates
18-
COPY --from=builder /bin/linux/amd64/kubeval .
18+
COPY --from=builder /bin/kubeval .
1919
COPY --from=standalone-schemas /kubernetes-json-schema /schemas/kubernetes-json-schema/master
2020
COPY --from=standalone-schemas /openshift-json-schema /schemas/openshift-json-schema/master
2121
ENV KUBEVAL_SCHEMA_LOCATION=file:///schemas

0 commit comments

Comments
 (0)