Revert to using babylon-sdk clone / checkout during ibcsim-bcd build

Use the sdk contracts for proper versioning
babylonlabs-io · Nov 26, 2024 · bc7e89a · bc7e89a
1 parent 606e2d6
commit bc7e89a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/contrib/images/Makefile b/contrib/images/Makefile
@@ -30,10 +30,7 @@ cosmos-relayer-rmi:
 	docker rmi babylonlabs-io/cosmos-relayer 2>/dev/null; true
 
 build-ibcsim-bcd:
-	cp -a $(BABYLON_FULL_PATH)/babylon-sdk/ $(BABYLON_FULL_PATH)/contrib/images/ibcsim-bcd
-	docker build --tag babylonlabs-io/ibcsim-bcd -f ibcsim-bcd/Dockerfile \
-		$(BABYLON_FULL_PATH)/contrib/images/ibcsim-bcd
-	rm -rf $(BABYLON_FULL_PATH)/contrib/images/ibcsim-bcd/babylon-sdk
+	docker build --tag babylonlabs-io/ibcsim-bcd -f ibcsim-bcd/Dockerfile ${BABYLON_FULL_PATH}
 
 ibcsim-bcd-rmi:
 	docker rmi babylonlabs-io/ibcsim-bcd 2>/dev/null; true

diff --git a/contrib/images/ibcsim-bcd/Dockerfile b/contrib/images/ibcsim-bcd/Dockerfile
@@ -16,18 +16,20 @@ ENV PATH /usr/local/go/bin:$PATH
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:$PATH
 
-WORKDIR /work
-
 ENV GO111MODULE on
 ENV RELAYER_TAG v2.5.2
+ENV BABYLON_SDK_TAG v0.6.0-rc.0
 
 # Install the relayer
 RUN git clone https://github.com/cosmos/relayer.git
 RUN cd relayer && git fetch origin && git checkout ${RELAYER_TAG} && make install && cd -
 
 # Install bcd
-ADD babylon-sdk /work/babylon-sdk
-RUN cd babylon-sdk && make install && cd -
+RUN git clone https://github.com/babylonlabs-io/babylon-sdk.git && \
+    cd babylon-sdk && \
+    git checkout ${BABYLON_SDK_TAG} && \
+    make install && \
+    cd -
 
 FROM debian:bullseye-slim AS run
 
@@ -49,8 +51,8 @@ COPY --from=build-env /go/bin/rly /usr/bin/rly
 COPY --from=build-env /go/bin/bcd /usr/bin/bcd
 
 WORKDIR /ibcsim-bcd
-COPY wrapper.sh /ibcsim-bcd/wrapper.sh
-COPY setup-bcd.sh /ibcsim-bcd/setup-bcd.sh
+COPY contrib/images/ibcsim-bcd/wrapper.sh /ibcsim-bcd/wrapper.sh
+COPY contrib/images/ibcsim-bcd/setup-bcd.sh /ibcsim-bcd/setup-bcd.sh
 COPY --from=build-env /work/babylon-sdk/tests/testdata/babylon_contract.wasm /ibcsim-bcd/babylon_contract.wasm
 COPY --from=build-env /work/babylon-sdk/tests/testdata/btc_staking.wasm /ibcsim-bcd/btc_staking.wasm
 COPY --from=build-env /work/babylon-sdk/tests/testdata/btc_finality.wasm /ibcsim-bcd/btc_finality.wasm