From 95cb86203d479a560908a161f7a9353170b4ade7 Mon Sep 17 00:00:00 2001 From: Alex Gartner Date: Tue, 6 Aug 2024 11:52:02 -0700 Subject: [PATCH] chore: fix docker build warnings --- Dockerfile-localnet | 9 +++++---- contrib/localnet/orchestrator/Dockerfile.fastbuild | 8 +++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Dockerfile-localnet b/Dockerfile-localnet index 5f42abeb6e..f5df2a671a 100644 --- a/Dockerfile-localnet +++ b/Dockerfile-localnet @@ -1,7 +1,8 @@ -# syntax=ghcr.io/zeta-chain/docker-dockerfile:1.7-labs +# 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 -ENV GOPATH /go +ENV GOPATH=/go ENV GOOS=linux ENV CGO_ENABLED=1 ENV GOCACHE=/root/.cache/go-build @@ -41,7 +42,7 @@ RUN mkdir -p /root/.zetacored/cosmovisor/genesis/bin && \ ln -s /usr/local/bin/zetaclientd /root/.zetaclientd/upgrades/genesis/zetacored && \ ln -s /root/.zetaclientd/upgrades/genesis /root/.zetaclientd/upgrades/current -ENV PATH /root/.zetacored/cosmovisor/current/bin/:/root/.zetaclientd/upgrades/current/:${PATH} +ENV PATH=/root/.zetacored/cosmovisor/current/bin/:/root/.zetaclientd/upgrades/current/:${PATH} COPY contrib/localnet/scripts /root COPY contrib/localnet/ssh_config /etc/ssh/ssh_config.d/localnet.conf @@ -62,7 +63,7 @@ COPY --from=latest-build /go/bin/zetacored /go/bin/zetaclientd /go/bin/zetaclien # Optional old version build (from source). This old build is used as the genesis version in the upgrade tests. # Use --target latest-runtime to skip. -FROM base-build as old-build-source +FROM base-build AS old-build-source ARG OLD_VERSION RUN git clone https://github.com/zeta-chain/node.git diff --git a/contrib/localnet/orchestrator/Dockerfile.fastbuild b/contrib/localnet/orchestrator/Dockerfile.fastbuild index c48b8f92b6..96f068cb31 100644 --- a/contrib/localnet/orchestrator/Dockerfile.fastbuild +++ b/contrib/localnet/orchestrator/Dockerfile.fastbuild @@ -1,6 +1,8 @@ -FROM zetanode:latest as zeta -FROM ghcr.io/zeta-chain/ethereum-client-go:v1.10.26 as geth -FROM ghcr.io/zeta-chain/golang:1.22.5-bookworm as orchestrator +# syntax=ghcr.io/zeta-chain/docker-dockerfile:1.9-labs +# check=error=true +FROM zetanode:latest AS zeta +FROM ghcr.io/zeta-chain/ethereum-client-go:v1.10.26 AS geth +FROM ghcr.io/zeta-chain/golang:1.22.5-bookworm AS orchestrator RUN apt update && \ apt install -yq jq yq curl tmux python3 openssh-server iputils-ping iproute2 && \