@@ -16,7 +16,7 @@ CARGO_CACHE_VOLUME_NAME?=firecracker-go-sdk--cargocache
1616DISABLE_ROOT_TESTS? =1
1717DOCKER_IMAGE_TAG? =latest
1818EXTRAGOARGS: =
19- FIRECRACKER_BUILDER_NAME = firecracker-builder
19+ FIRECRACKER_DIR =build/ firecracker
2020FIRECRACKER_TARGET? =x86_64-unknown-linux-musl
2121
2222FC_TEST_DATA_PATH? =testdata
@@ -85,38 +85,21 @@ $(FC_TEST_DATA_PATH)/ltag:
8585 GO111MODULE=off GOBIN=$(abspath $(FC_TEST_DATA_PATH ) ) \
8686 go get github.com/kunalkushwaha/ltag
8787
88- tools/firecracker-builder-stamp : tools/docker/Dockerfile
89- docker build \
90- -t localhost/$(FIRECRACKER_BUILDER_NAME ) :$(DOCKER_IMAGE_TAG ) \
91- -f tools/docker/Dockerfile \
92- tools/docker
93- touch $@
88+ $(FIRECRACKER_DIR ) :
89+ - git clone https://github.com/firecracker-microvm/firecracker.git $(FIRECRACKER_DIR )
9490
9591.PHONY : test-images
9692test-images : $(FIRECRACKER_BIN ) $(JAILER_BIN )
9793
98- $(FIRECRACKER_BIN ) $(JAILER_BIN ) : tools/firecracker-builder-stamp
99- mkdir -p build
100- docker run --rm -it \
101- --user $(UID ) :$(GID ) \
102- --volume $(CURDIR ) /build:/artifacts \
103- --volume $(CARGO_CACHE_VOLUME_NAME ) :/usr/local/cargo/registry \
104- -e HOME=/tmp \
105- --workdir=/firecracker \
106- localhost/$(FIRECRACKER_BUILDER_NAME ) :$(DOCKER_IMAGE_TAG ) \
107- cargo build --release \
108- --target-dir=/artifacts --target $(FIRECRACKER_TARGET ) \
109- -p firecracker -p jailer
110- cp build/$(FIRECRACKER_TARGET ) /release/firecracker $(FIRECRACKER_BIN )
111- cp build/$(FIRECRACKER_TARGET ) /release/jailer $(JAILER_BIN )
94+ $(FIRECRACKER_BIN ) $(JAILER_BIN ) : $(FIRECRACKER_DIR )
95+ $(FIRECRACKER_DIR ) /tools/devtool -y build --release && \
96+ $(FIRECRACKER_DIR ) /tools/devtool strip
97+ cp $(FIRECRACKER_DIR ) /build/cargo_target/$(FIRECRACKER_TARGET ) /release/firecracker $(FIRECRACKER_BIN )
98+ cp $(FIRECRACKER_DIR ) /build/cargo_target/$(FIRECRACKER_TARGET ) /release/jailer $(JAILER_BIN )
11299
113100.PHONY : firecracker-clean
114101firecracker-clean :
115- - docker run --rm -it \
116- --user $(UID ) :$(GID ) \
117- --workdir /firecracker\
118- localhost/$(FIRECRACKER_BUILDER_NAME ) :$(DOCKER_IMAGE_TAG ) \
119- cargo clean
102+ - $(FIRECRACKER_DIR ) /tools/devtool distclean
120103 - rm $(FIRECRACKER_BIN ) $(JAILER_BIN )
121104
122105lint : deps
0 commit comments