From d4be15f3c3d3ffbb59792f17b1cdd23c8858d5ae Mon Sep 17 00:00:00 2001
From: Philip Offtermatt
Date: Mon, 18 Sep 2023 15:29:05 +0200
Subject: [PATCH] Run in CometMock container
---
Dockerfile-test | 7 ++-----
Makefile | 3 +--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Dockerfile-test b/Dockerfile-test
index ec242ee..a54039f 100644
--- a/Dockerfile-test
+++ b/Dockerfile-test
@@ -1,4 +1,5 @@
# import simd from ibc-go
+FROM ghcr.io/cosmos/simapp:v0.47 AS simapp-builder
FROM golang:1.20-alpine as cometmock-builder
@@ -19,11 +20,7 @@ ADD . /CometMock
WORKDIR /CometMock
RUN go build -o /usr/local/bin/cometmock ./cometmock
-FROM ghcr.io/cosmos/simapp:v0.47
RUN apk update
RUN apk add --no-cache which iputils procps-ng tmux net-tools htop jq gcompat
-COPY --from=cometmock-builder /usr/local/bin/cometmock /usr/local/bin/cometmock
-
-COPY . /CometMock
-
+COPY --from=simapp-builder /usr/bin/simd /usr/local/bin/simd
\ No newline at end of file
diff --git a/Makefile b/Makefile
index f758ed2..343ad1d 100644
--- a/Makefile
+++ b/Makefile
@@ -10,5 +10,4 @@ test-docker:
# Start a container and execute the test command inside
docker rm cometmock-test-instance || true
- docker run --name cometmock-test-instance --workdir /CometMock cometmock-test simd --help
- # docker run --name cometmock-test-instance --workdir /CometMock cometmock-test go test -timeout 600s ./e2e-tests -test.v
\ No newline at end of file
+ docker run --name cometmock-test-instance --workdir /CometMock cometmock-test go test -timeout 600s ./e2e-tests -test.v
\ No newline at end of file