Skip to content

Commit

Permalink
Merge pull request #80 from rancher/bump-go
Browse files Browse the repository at this point in the history
bump go version to 1.20
  • Loading branch information
joshmeranda authored Dec 7, 2023
2 parents 2453070 + e504c7a commit 51f049d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/e2e/package/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.suse.com/bci/golang:1.19 AS helm
FROM registry.suse.com/bci/golang:1.20 AS helm
RUN zypper -n install git
RUN git -C / clone --branch release-v3.9.0 --depth=1 https://github.com/rancher/helm
RUN make -C /helm

FROM registry.suse.com/bci/golang:1.19
FROM registry.suse.com/bci/golang:1.20

ARG ARCH=amd64
ENV KUBECTL_VERSION v1.21.8
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.suse.com/bci/golang:1.19 AS helm
FROM registry.suse.com/bci/golang:1.20 AS helm
RUN zypper -n install git
RUN git -C / clone --branch release-v3.9.0 --depth=1 https://github.com/rancher/helm
RUN make -C /helm

FROM registry.suse.com/bci/golang:1.19
FROM registry.suse.com/bci/golang:1.20

ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/rancher/prometheus-federator

go 1.19
go 1.20

replace (
k8s.io/api => k8s.io/api v0.25.4
Expand Down

0 comments on commit 51f049d

Please sign in to comment.