diff --git a/dockerfile/dockerfile b/dockerfile/dockerfile index b1a6b5a8..bb9a8380 100644 --- a/dockerfile/dockerfile +++ b/dockerfile/dockerfile @@ -1,7 +1,7 @@ # This is a docker image for helmsman -FROM golang:1.12.9-alpine3.10 as builder +FROM golang:1.13.3-alpine3.10 as builder WORKDIR /go/src/ @@ -25,8 +25,8 @@ FROM alpine:3.10 ARG KUBE_VERSION ARG HELM_VERSION -ENV KUBE_VERSION ${KUBE_VERSION:-v1.11.3} -ENV HELM_VERSION ${HELM_VERSION:-v2.11.0} +ENV KUBE_VERSION ${KUBE_VERSION:-v1.14.8} +ENV HELM_VERSION ${HELM_VERSION:-v2.15.0} ENV HELM_DIFF_VERSION ${HELM_DIFF_VERSION:-v2.11.0+5} RUN apk --no-cache update \ @@ -52,4 +52,3 @@ RUN mkdir -p ~/.helm/plugins \ WORKDIR /tmp # ENTRYPOINT ["/bin/helmsman"] - diff --git a/test_files/dockerfile b/test_files/dockerfile index 6d0b1375..46e6a547 100644 --- a/test_files/dockerfile +++ b/test_files/dockerfile @@ -4,11 +4,11 @@ ARG KUBE_VERSION ARG HELM_VERSION -FROM golang:1.12.9-alpine3.10 +FROM golang:1.13.3-alpine3.10 -ENV KUBE_VERSION ${KUBE_VERSION:-v1.11.3} -ENV HELM_VERSION ${HELM_VERSION:-v2.14.3} -ENV GORELEASER_VERSION ${GORELEASER_VERSION:-v0.117.1} +ENV KUBE_VERSION ${KUBE_VERSION:-v1.14.8} +ENV HELM_VERSION ${HELM_VERSION:-v2.15.0} +ENV GORELEASER_VERSION ${GORELEASER_VERSION:-v0.120.2} RUN apk --no-cache update \ && apk add --update --no-cache ca-certificates git \ && apk add --update -t deps curl tar gzip make bash gcc \ @@ -34,4 +34,4 @@ RUN mkdir /tmp/goreleaser \ && mv /tmp/goreleaser/goreleaser /usr/local/bin/goreleaser \ && rm -r /tmp/goreleaser \ && chmod +x /usr/local/bin/goreleaser \ - && go get github.com/golang/dep/cmd/dep \ No newline at end of file + && go get github.com/golang/dep/cmd/dep