Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependencies upgrade #306

Merged
merged 11 commits into from
Oct 22, 2019
Merged

Dependencies upgrade #306

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c08723c
Upgrade to go v1.13.3
chenrui333 Oct 18, 2019
74665e9
goreleaser v0.119.0
chenrui333 Oct 18, 2019
c3a5dc0
helm v2.15.0
chenrui333 Oct 18, 2019
f13108b
k8s v1.16.2
chenrui333 Oct 18, 2019
dd7e6a7
helm v2.15.0
chenrui333 Oct 18, 2019
717672d
Merge branch 'master' into upgrade-deps
luisdavim Oct 21, 2019
fc1b940
Merge branch 'master' into upgrade-deps
chenrui333 Oct 21, 2019
4affd4c
Merge branch 'master' into upgrade-deps
luisdavim Oct 21, 2019
ac2c0fd
goreleaser v0.120.2
chenrui333 Oct 21, 2019
7ebb469
Merge branch 'master' into upgrade-deps
luisdavim Oct 22, 2019
8baab7d
k8s v1.14.8
chenrui333 Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions dockerfile/dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/

Expand All @@ -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.16.2}
ENV HELM_VERSION ${HELM_VERSION:-v2.15.0}
ENV HELM_DIFF_VERSION ${HELM_DIFF_VERSION:-v2.11.0+5}

RUN apk --no-cache update \
Expand All @@ -52,4 +52,3 @@ RUN mkdir -p ~/.helm/plugins \

WORKDIR /tmp
# ENTRYPOINT ["/bin/helmsman"]

10 changes: 5 additions & 5 deletions test_files/dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.16.2}
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 \
Expand All @@ -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
&& go get github.com/golang/dep/cmd/dep