From 9bcce801dcac4bd3a1b4cf6b300abd2347d74d6e Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 5 Feb 2021 11:14:01 +0100 Subject: [PATCH] Update Go to 1.15.8 Signed-off-by: Tobias Klauser --- .github/workflows/unittests.yml | 4 ++-- Dockerfile | 2 +- Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index b2662ad10..e8d0c980d 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -17,7 +17,7 @@ jobs: path: go/src/github.com/cilium/hubble - uses: actions/setup-go@v2.1.3 with: - go-version: '1.15.7' + go-version: '1.15.8' - name: Run static checks env: GOPATH: /home/runner/work/hubble/go @@ -38,7 +38,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2.1.3 with: - go-version: '1.15.7' + go-version: '1.15.8' - name: Checkout code uses: actions/checkout@v2 - name: Check module vendoring diff --git a/Dockerfile b/Dockerfile index 25779b099..11e13574e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/golang:1.15.7-alpine3.13 as builder +FROM docker.io/library/golang:1.15.8-alpine3.13 as builder WORKDIR /go/src/github.com/cilium/hubble RUN apk add --no-cache git make COPY . . diff --git a/Makefile b/Makefile index f89e7b768..e17fb57f5 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,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.15.7-alpine3.13 \ + docker run --env "RELEASE_UID=$(RELEASE_UID)" --env "RELEASE_GID=$(RELEASE_GID)" --rm --workdir /hubble --volume `pwd`:/hubble docker.io/library/golang:1.15.8-alpine3.13 \ sh -c "apk add --no-cache make && make local-release" local-release: clean