Fix the usage of version

Finschia · Dec 21, 2022 · a4154f5 · a4154f5
1 parent a0043ca
commit a4154f5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -9,7 +9,7 @@ on:
       - release/**
 
 env:
-  TAG: ostracon/e2e-node
+  TAG: ostracon/e2e-node:local-version # See test/e2e/Makefile:docker
   CACHE_DIR: /tmp/ostracon/e2etest
 
 jobs:

diff --git a/test/e2e/Makefile b/test/e2e/Makefile
@@ -1,7 +1,12 @@
 all: docker generator runner
 
 docker:
-	docker build --progress=plain --tag ostracon/e2e-node --tag ostracon/e2e-node:local-version -f docker/Dockerfile ../..
+	# See the default version on test/e2e/pkg/testnet.go:LoadTestnet
+	# Relate the "docker-compose.yml" on test/e2e/pkg/infra/docker/docker.go:dockerComposeBytes
+	# Relate the "cleanup" on test/e2e/runner/cleanup.go:cleanupDir
+	docker build --progress=plain \
+		--tag ostracon/e2e-node:local-version \
+		-f docker/Dockerfile ../..
 
 # We need to build support for database backends into the app in
 # order to build a binary with an Ostracon node in it (for built-in

diff --git a/test/e2e/runner/cleanup.go b/test/e2e/runner/cleanup.go
@@ -16,7 +16,7 @@ func Cleanup(testnet *e2e.Testnet) error {
 	if err != nil {
 		return err
 	}
-	err = cleanupDir(testnet.Dir)
+	err = cleanupDir(testnet.Dir, testnet.Nodes[0].Version)
 	if err != nil {
 		return err
 	}
@@ -48,7 +48,7 @@ func cleanupDocker() error {
 }
 
 // cleanupDir cleans up a testnet directory
-func cleanupDir(dir string) error {
+func cleanupDir(dir, version string) error {
 	if dir == "" {
 		return errors.New("no directory set")
 	}
@@ -70,7 +70,7 @@ func cleanupDir(dir string) error {
 		return err
 	}
 	err = execDocker("run", "--rm", "--entrypoint", "", "-v", fmt.Sprintf("%v:/network", absDir),
-		"ostracon/e2e-node", "sh", "-c", "rm -rf /network/*/")
+		fmt.Sprintf("ostracon/e2e-node:%s", version), "sh", "-c", "rm -rf /network/*/")
 	if err != nil {
 		return err
 	}