diff --git a/Dockerfile b/Dockerfile index e5b7b4ba..3501753b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,7 @@ WORKDIR /go/src/mikefarah/yq # cache devtools COPY ./scripts/devtools.sh /go/src/mikefarah/yq/scripts/devtools.sh -RUN ./scripts/devtools.sh -#RUN apk update && apk upgrade && apk add bash +RUN ./scripts/devtools.sh COPY . /go/src/mikefarah/yq RUN CGO_ENABLED=0 make local build @@ -16,7 +15,7 @@ FROM alpine:3.8 as production COPY --from=builder /go/src/mikefarah/yq/yq /usr/bin/yq RUN chmod +x /usr/bin/yq -RUN apk update && apk upgrade && apk add bash + ARG VERSION=none LABEL version=${VERSION} diff --git a/Dockerfile.bash b/Dockerfile.bash new file mode 100644 index 00000000..e5b7b4ba --- /dev/null +++ b/Dockerfile.bash @@ -0,0 +1,23 @@ +FROM golang:1.15 as builder + +WORKDIR /go/src/mikefarah/yq + +# cache devtools +COPY ./scripts/devtools.sh /go/src/mikefarah/yq/scripts/devtools.sh +RUN ./scripts/devtools.sh +#RUN apk update && apk upgrade && apk add bash +COPY . /go/src/mikefarah/yq + +RUN CGO_ENABLED=0 make local build + +# Choose alpine as a base image to make this useful for CI, as many +# CI tools expect an interactive shell inside the container +FROM alpine:3.8 as production + +COPY --from=builder /go/src/mikefarah/yq/yq /usr/bin/yq +RUN chmod +x /usr/bin/yq +RUN apk update && apk upgrade && apk add bash +ARG VERSION=none +LABEL version=${VERSION} + +WORKDIR /workdir