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

Update to golang 1.14.1 #367

Merged
merged 8 commits into from
Apr 2, 2020
Merged

Update to golang 1.14.1 #367

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a56ef82
update to golang 1.14.0
tfussell Mar 3, 2020
26ff7fe
Merge branch 'master' into update-golang
tfussell Mar 6, 2020
3e36a94
Merge branch 'master' into update-golang
tfussell Mar 19, 2020
97955ff
Merge branch 'master' into update-golang
tfussell Mar 19, 2020
86f2f15
Merge branch 'master' into update-golang
tfussell Mar 20, 2020
ff88e1a
Merge branch 'master' into update-golang
kopiczko Mar 26, 2020
00ac059
update to golang 1.14.1
tfussell Apr 2, 2020
3432389
Merge remote-tracking branch 'origin/master' into update-golang
tfussell Apr 2, 2020
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
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM quay.io/giantswarm/helm-chart-testing:v2.4.0 AS ct

RUN pip freeze > /helm-chart-testing-py-requirements.txt

FROM quay.io/giantswarm/golang:1.13.1-alpine3.10 AS golang
FROM quay.io/giantswarm/golang:1.14.1-alpine3.11 AS golang

# Build Image
FROM quay.io/giantswarm/alpine:3.10
FROM quay.io/giantswarm/alpine:3.11

# Copy go from golang image.
COPY --from=golang /usr/local/go /usr/local/go
Expand All @@ -19,7 +19,7 @@ COPY --from=ct /etc/ct/lintconf.yaml /etc/ct/lintconf.yaml
ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

ARG HELM_VERSION=v2.14.3
ARG HELM_VERSION=v2.16.3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<3

ARG GOLANGCI_LINT_VERSION=v1.23.8

RUN apk add --no-cache \
Expand Down
2 changes: 1 addition & 1 deletion cmd/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func init() {
buildCmd.Flags().StringVar(&helmDirectoryPath, "helm-directory-path", "./helm", "directory holding helm chart")

buildCmd.Flags().StringVar(&golangImage, "golang-image", "quay.io/giantswarm/golang", "golang image")
buildCmd.Flags().StringVar(&golangVersion, "golang-version", "1.13.1", "golang version")
buildCmd.Flags().StringVar(&golangVersion, "golang-version", "1.14.1", "golang version")
}

func runBuild(cmd *cobra.Command, args []string) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/giantswarm/architect

go 1.13
go 1.14

require (
github.com/Masterminds/semver v1.5.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions tasks/docker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ func TestNewDockerTask(t *testing.T) {
"GOOS=linux",
},
WorkingDirectory: "/go/src/github.com/giantswarm/architect",
Image: "golang:1.13.1",
Image: "golang:1.14.1",
Args: []string{"go", "test"},
},
expectedArgs: []string{
"docker", "run", "--rm",
"-v", "/home/ubuntu/architect:/go/src/github.com/giantswarm/architect",
"-e", "GOOS=linux",
"-w", "/go/src/github.com/giantswarm/architect",
"golang:1.13.1",
"golang:1.14.1",
"go", "test",
},
},
Expand Down