Skip to content

Commit

Permalink
Merge zegl#387
Browse files Browse the repository at this point in the history
387: Upgrade Go, Alpine, and Helm dependencies r=zegl a=zegl

<!--
    Optional: Add this change to the release notes by adding a RELNOTE comment
    If this shouldn't appear in the notes, simply remove this.
-->

```
RELNOTE: Upgrade alpine to 3.14.2. Upgrade Go to 1.17. Upgrade Helm 2 to v2.17.0. Upgrade Helm 3 to v3.6.3.
```


Co-authored-by: Gustav Westling <[email protected]>
  • Loading branch information
bors[bot] and zegl authored Aug 28, 2021
2 parents 7c1d27d + e1e77f5 commit 82810c4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
test:
docker:
- image: circleci/golang:1.15
- image: circleci/golang:1.17
working_directory: /go/app
steps:
- checkout
Expand Down
6 changes: 3 additions & 3 deletions cmd/kube-score/helm.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM debian:stretch as downloader

ARG HELM_VERSION=v2.14.3
ARG HELM_SHA256SUM="38614a665859c0f01c9c1d84fa9a5027364f936814d1e47839b05327e400bf55"
ARG HELM_VERSION=v2.17.0
ARG HELM_SHA256SUM="f3bec3c7c55f6a9eb9e6586b8c503f370af92fe987fcbf741f37707606d70296"

RUN apt-get update && \
apt-get install -y curl && \
Expand All @@ -10,7 +10,7 @@ RUN apt-get update && \
tar xzvf helm.tar.gz && \
chmod +x /linux-amd64/helm

FROM alpine:3.10.1
FROM alpine:3.14.2
RUN apk update && \
apk upgrade && \
apk add bash ca-certificates
Expand Down
6 changes: 3 additions & 3 deletions cmd/kube-score/helm3.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM debian:stretch as downloader

ARG HELM_VERSION=v3.5.0
ARG HELM_SHA256SUM="3fff0354d5fba4c73ebd5db59a59db72f8a5bbe1117a0b355b0c2983e98db95b"
ARG HELM_VERSION=v3.6.3
ARG HELM_SHA256SUM="07c100849925623dc1913209cd1a30f0a9b80a5b4d6ff2153c609d11b043e262"

RUN apt-get update && \
apt-get install -y curl && \
Expand All @@ -10,7 +10,7 @@ RUN apt-get update && \
tar xzvf helm.tar.gz && \
chmod +x /linux-amd64/helm

FROM alpine:3.10.1
FROM alpine:3.14.2
RUN apk update && \
apk upgrade && \
apk add bash ca-certificates
Expand Down

0 comments on commit 82810c4

Please sign in to comment.