From ca4eef55964db6a2792536fdb08d4bd235ff2635 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 13 Jul 2022 14:23:37 +0200 Subject: [PATCH] Update Go to 1.18.4 This includes various security fixes, see https://go.dev/doc/devel/release#go1.18.4 for details. 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 8539f03cc..7b7e784f4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: - go-version: '1.18.3' + go-version: '1.18.4' - name: Run static checks uses: golangci/golangci-lint-action@537aa1903e5d359d0b27dbc19ddd22c5087f3fbc with: diff --git a/Dockerfile b/Dockerfile index 6af61eb69..46e3c626e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/golang:1.18.3-alpine3.16@sha256:7cc62574fcf9c5fb87ad42a9789d5539a6a085971d58ee75dd2ee146cb8a8695 as builder +FROM docker.io/library/golang:1.18.4-alpine3.16@sha256:46f1fa18ca1ec228f7ea4978ad717f0a8c5e51436e7b8efaf64011f7729886df as builder WORKDIR /go/src/github.com/cilium/hubble RUN apk add --no-cache git make COPY . . diff --git a/Makefile b/Makefile index 002d053cb..275068712 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 --rm --workdir /hubble --volume `pwd`:/hubble docker.io/library/golang:1.18.3-alpine3.16 \ + docker run --rm --workdir /hubble --volume `pwd`:/hubble docker.io/library/golang:1.18.4-alpine3.16 \ sh -c "apk add --no-cache make git && \ addgroup -g $(RELEASE_GID) release && \ adduser -u $(RELEASE_UID) -D -G release release && \