Define makefile to build image

libp2p · Feb 9, 2023 · c4d0a96 · c4d0a96
1 parent a3e7a48
commit c4d0a96
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 28 deletions.
diff --git a/multidim-interop/rust/v0.50/.gitignore b/multidim-interop/rust/v0.50/.gitignore
@@ -1,3 +1,4 @@
-repo.zip
-rust-libp2p/*
-rust-libp2p
+rust-libp2p-*.zip
+rust-libp2p-*
+rust-libp2p-*/*
+image.json
diff --git a/multidim-interop/rust/v0.50/Dockerfile b/multidim-interop/rust/v0.50/Dockerfile
diff --git a/multidim-interop/rust/v0.50/Makefile b/multidim-interop/rust/v0.50/Makefile
@@ -1,18 +1,20 @@
 image_name := rust-v0.50
-commitSha = 53e477d4423106bb9f9e744a4b275dfb6213ca0a
+commitSha := 1f0f0e240cc25480d1b5fb488abfb69bf06812f0
 
-image.json: Dockerfile rust-libp2p
-	IMAGE_NAME=${image_name} ../../dockerBuildWrapper.sh .
+all: image.json
+
+image.json: rust-libp2p-${commitSha}
+	cd rust-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile .
 	docker image inspect ${image_name} -f "{{.Id}}" | \
 		xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
 
-rust-libp2p: repo.zip
-	unzip repo.zip
-	mv rust-libp2p-$(commitSha) rust-libp2p
+rust-libp2p-${commitSha}: rust-libp2p-${commitSha}.zip
+	unzip -o rust-libp2p-${commitSha}.zip
 
-repo.zip:
-	wget -O repo.zip "https://github.com/libp2p/rust-libp2p/archive/$(commitSha).zip"
+rust-libp2p-${commitSha}.zip:
+	wget -O $@ "https://github.com/libp2p/rust-libp2p/archive/${commitSha}.zip"
 
 clean:
-	rm -rf rust-libp2p
-	rm repo.zip
+	rm image.json
+	rm rust-libp2p-*.zip
+	rm -rf rust-libp2p-*
diff --git a/multidim-interop/rust/v0.50/repo.zip b/multidim-interop/rust/v0.50/repo.zip