From 21c912792e20d6d16b2a4abf0fdb49dbea6d07fd Mon Sep 17 00:00:00 2001 From: Alex Gartner Date: Fri, 25 Oct 2024 11:29:42 -0700 Subject: [PATCH] upgrade to go 1.22.7 --- Dockerfile-localnet | 6 +++--- Makefile | 2 +- contrib/localnet/orchestrator/Dockerfile.fastbuild | 2 +- scripts/gosec.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile-localnet b/Dockerfile-localnet index 0ec2408120..49247d6be4 100644 --- a/Dockerfile-localnet +++ b/Dockerfile-localnet @@ -1,6 +1,6 @@ # syntax=ghcr.io/zeta-chain/docker-dockerfile:1.9-labs # check=error=true -FROM ghcr.io/zeta-chain/golang:1.22.5-bookworm AS base-build +FROM ghcr.io/zeta-chain/golang:1.22.7-bookworm AS base-build ENV GOPATH=/go ENV GOOS=linux @@ -27,10 +27,10 @@ RUN --mount=type=cache,target="/root/.cache/go-build" \ NODE_COMMIT=${NODE_COMMIT} \ make install install-zetae2e -FROM ghcr.io/zeta-chain/golang:1.22.5-bookworm AS cosmovisor-build +FROM ghcr.io/zeta-chain/golang:1.22.7-bookworm AS cosmovisor-build RUN go install cosmossdk.io/tools/cosmovisor/cmd/cosmovisor@v1.6.0 -FROM ghcr.io/zeta-chain/golang:1.22.5-bookworm AS base-runtime +FROM ghcr.io/zeta-chain/golang:1.22.7-bookworm AS base-runtime RUN apt update && \ apt install -yq jq yq curl tmux python3 openssh-server iputils-ping iproute2 bind9-host && \ diff --git a/Makefile b/Makefile index 1e87c984e9..8ee617a9d2 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ DOCKER ?= docker DOCKER_COMPOSE ?= $(DOCKER) compose -f docker-compose.yml $(NODE_COMPOSE_ARGS) DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf GOFLAGS := "" -GOLANG_CROSS_VERSION ?= v1.22.4 +GOLANG_CROSS_VERSION ?= v1.22.7 GOPATH ?= '$(HOME)/go' ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=zetacore \ diff --git a/contrib/localnet/orchestrator/Dockerfile.fastbuild b/contrib/localnet/orchestrator/Dockerfile.fastbuild index c776d96c06..cbab881a65 100644 --- a/contrib/localnet/orchestrator/Dockerfile.fastbuild +++ b/contrib/localnet/orchestrator/Dockerfile.fastbuild @@ -3,7 +3,7 @@ FROM zetanode:latest AS zeta FROM ghcr.io/zeta-chain/ethereum-client-go:v1.10.26 AS geth FROM ghcr.io/zeta-chain/solana-docker:1.18.15 AS solana -FROM ghcr.io/zeta-chain/golang:1.22.5-bookworm AS orchestrator +FROM ghcr.io/zeta-chain/golang:1.22.7-bookworm AS orchestrator RUN apt update && \ apt install -yq jq yq curl tmux python3 openssh-server iputils-ping iproute2 bind9-host && \ diff --git a/scripts/gosec.sh b/scripts/gosec.sh index 2b831a35e9..24cc1075ac 100644 --- a/scripts/gosec.sh +++ b/scripts/gosec.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker run -it --rm -w /node -v "$(pwd):/node" ghcr.io/zeta-chain/gosec:2.21.0-zeta -exclude-generated -exclude-dir testutil ./... \ No newline at end of file +docker run -it --rm -w /node -v "$(pwd):/node" ghcr.io/zeta-chain/gosec:2.21.0-zeta2 -exclude-generated -exclude-dir testutil ./... \ No newline at end of file