diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0e9668f03..6c5ef3eef 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@v3 with: - go-version: '1.18.1' + go-version: '1.18.2' - name: Run static checks uses: golangci/golangci-lint-action@v3.1.0 with: diff --git a/Dockerfile b/Dockerfile index 18b6d8f99..13ae5ebe4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/golang:1.18.1-alpine3.15@sha256:f94174c5262af3d8446833277aa27af400fd1a880277d43ec436df06ef3bb8ab as builder +FROM docker.io/library/golang:1.18.1-alpine3.15@sha256:e6b729ae22a2f7b6afcc237f7b9da3a27151ecbdcd109f7ab63a42e52e750262 as builder WORKDIR /go/src/github.com/cilium/hubble RUN apk add --no-cache git make COPY . . diff --git a/Makefile b/Makefile index 5c08679c0..95f50332d 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.18.1-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.18.2-alpine3.15 \ sh -c "apk add --no-cache make git && make local-release" local-release: clean