From 746750b0b682c8266bdc010001b0eb7eca99bf9a Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 10 Jan 2022 11:31:29 +0100 Subject: [PATCH] Update Go to 1.17.6 Signed-off-by: Tobias Klauser --- .github/workflows/tests.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 62fa185e6..7efc21516 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 - uses: actions/setup-go@v2.1.5 with: - go-version: '1.17.5' + go-version: '1.17.6' - name: Run static checks uses: golangci/golangci-lint-action@v2 with: diff --git a/Dockerfile b/Dockerfile index c07a1710a..5eb80a9c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/golang:1.17.5-alpine3.15@sha256:4918412049183afe42f1ecaf8f5c2a88917c2eab153ce5ecf4bf2d55c1507b74 as builder +FROM docker.io/library/golang:1.17.6-alpine3.15@sha256:519c827ec22e5cf7417c9ff063ec840a446cdd30681700a16cf42eb43823e27c as builder WORKDIR /go/src/github.com/cilium/hubble RUN apk add --no-cache git make COPY . . diff --git a/Makefile b/Makefile index 3ac6804ed..3e6b71ea8 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ hubble: $(GO_BUILD) $(if $(GO_TAGS),-tags $(GO_TAGS)) -ldflags "-w -s -X 'github.com/cilium/hubble/pkg.GitBranch=${GIT_BRANCH}' -X 'github.com/cilium/hubble/pkg.GitHash=$(GIT_HASH)' -X 'github.com/cilium/hubble/pkg.Version=${VERSION}'" -o $(TARGET) release: - docker run --env "RELEASE_UID=$(RELEASE_UID)" --env "RELEASE_GID=$(RELEASE_GID)" --rm --workdir /hubble --volume `pwd`:/hubble docker.io/library/golang:1.17.5-alpine3.15 \ + docker run --env "RELEASE_UID=$(RELEASE_UID)" --env "RELEASE_GID=$(RELEASE_GID)" --rm --workdir /hubble --volume `pwd`:/hubble docker.io/library/golang:1.17.6-alpine3.15 \ sh -c "apk add --no-cache make && make local-release" local-release: clean