From 38c35683fb1715a1fed356d4726d35381761c079 Mon Sep 17 00:00:00 2001 From: RafilxTenfen Date: Tue, 3 Sep 2024 12:01:45 -0300 Subject: [PATCH 1/2] chore: add version argument for e2e-initialization docker for before upgrade version --- contrib/images/Makefile | 3 ++- contrib/images/e2e-initialization/init.Dockerfile | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/contrib/images/Makefile b/contrib/images/Makefile index 1c0260999..4c2d183d8 100644 --- a/contrib/images/Makefile +++ b/contrib/images/Makefile @@ -1,6 +1,7 @@ RELAYER_TAG := $(shell grep '^ENV RELAYER_TAG' cosmos-relayer/Dockerfile | cut -f3 -d\ ) BABYLON_FULL_PATH := $(shell git rev-parse --show-toplevel) BABYLON_VERSION_BEFORE_UPGRADE ?= v0.9.1 +E2E_INIT_CHAIN_VERSION_BEFORE_UPGRADE ?= v0.9.3 all: babylond cosmos-relayer @@ -27,7 +28,7 @@ e2e-init-chain-rmi: e2e-init-chain: @DOCKER_BUILDKIT=1 docker build -t babylonlabs-io/babylond-e2e-init-chain --build-arg E2E_SCRIPT_NAME=chain --platform=linux/x86_64 \ - -f e2e-initialization/init.Dockerfile ${BABYLON_FULL_PATH} + -f e2e-initialization/init.Dockerfile --build-arg VERSION="${E2E_INIT_CHAIN_VERSION_BEFORE_UPGRADE}" ${BABYLON_FULL_PATH} e2e-init-chain-rmi: docker rmi babylonlabs-io/babylond-e2e-init-chain 2>/dev/null; true diff --git a/contrib/images/e2e-initialization/init.Dockerfile b/contrib/images/e2e-initialization/init.Dockerfile index 5621cbeca..80c7ab973 100644 --- a/contrib/images/e2e-initialization/init.Dockerfile +++ b/contrib/images/e2e-initialization/init.Dockerfile @@ -1,11 +1,19 @@ FROM golang:1.21 as build-env ARG E2E_SCRIPT_NAME +# Version to build. Default is empty +ARG VERSION # Copy All WORKDIR /go/src/github.com/babylonlabs-io/babylon COPY ./ /go/src/github.com/babylonlabs-io/babylon/ +# Handle if version is set +RUN if [ -n "${VERSION}" ]; then \ + git fetch origin tag ${VERSION} --no-tags; \ + git checkout -f ${VERSION}; \ + fi + RUN LEDGER_ENABLED=false LINK_STATICALLY=false E2E_SCRIPT_NAME=${E2E_SCRIPT_NAME} make e2e-build-script FROM debian:bookworm-slim AS wasm-link From 52ca526bfa0fed136496a02fe42e34d35d71532c Mon Sep 17 00:00:00 2001 From: RafilxTenfen Date: Tue, 3 Sep 2024 13:18:17 -0300 Subject: [PATCH 2/2] chore: reduce before upgrade var to use v093 --- contrib/images/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/images/Makefile b/contrib/images/Makefile index 4c2d183d8..e708e22ac 100644 --- a/contrib/images/Makefile +++ b/contrib/images/Makefile @@ -1,7 +1,6 @@ RELAYER_TAG := $(shell grep '^ENV RELAYER_TAG' cosmos-relayer/Dockerfile | cut -f3 -d\ ) BABYLON_FULL_PATH := $(shell git rev-parse --show-toplevel) -BABYLON_VERSION_BEFORE_UPGRADE ?= v0.9.1 -E2E_INIT_CHAIN_VERSION_BEFORE_UPGRADE ?= v0.9.3 +BABYLON_VERSION_BEFORE_UPGRADE ?= v0.9.3 all: babylond cosmos-relayer @@ -28,7 +27,7 @@ e2e-init-chain-rmi: e2e-init-chain: @DOCKER_BUILDKIT=1 docker build -t babylonlabs-io/babylond-e2e-init-chain --build-arg E2E_SCRIPT_NAME=chain --platform=linux/x86_64 \ - -f e2e-initialization/init.Dockerfile --build-arg VERSION="${E2E_INIT_CHAIN_VERSION_BEFORE_UPGRADE}" ${BABYLON_FULL_PATH} + -f e2e-initialization/init.Dockerfile --build-arg VERSION="${BABYLON_VERSION_BEFORE_UPGRADE}" ${BABYLON_FULL_PATH} e2e-init-chain-rmi: docker rmi babylonlabs-io/babylond-e2e-init-chain 2>/dev/null; true