Merge pull request #185 from kzys/firecracker-clean

Fix firecracker-clean target

Author: kzys

.gitignore

@@ -5,3 +5,5 @@ jailer-*
 vmlinux
 root-drive.img
 TestPID.img
+build/
+

Makefile

@@ -44,9 +44,12 @@ check-kvm:
 	@test -w /dev/kvm || \
 		(echo "In order to run firecracker, $(shell whoami) must have write permission to /dev/kvm"; false)
 
-generate build clean:
+generate build clean::
 	go $@ $(EXTRAGOARGS)
 
+clean::
+	rm -fr build/
+
 distclean: clean
 	rm -rf $(testdata_objects)
 	docker volume rm -f $(CARGO_CACHE_VOLUME_NAME)
@@ -65,21 +68,25 @@ tools/firecracker-builder-stamp: tools/docker/Dockerfile
 	docker build \
 		-t localhost/$(FIRECRACKER_BUILDER_NAME):$(DOCKER_IMAGE_TAG) \
 		-f tools/docker/Dockerfile \
-		.
+		tools/docker
 	touch $@
 
 .PHONY: test-images
 test-images: $(FIRECRACKER_BIN) $(JAILER_BIN)
 
 $(FIRECRACKER_BIN) $(JAILER_BIN): tools/firecracker-builder-stamp
+	mkdir -p build
 	docker run --rm -it \
 		--user $(UID):$(GID) \
-		--volume $(CURDIR)/testdata:/artifacts \
+		--volume $(CURDIR)/build:/artifacts \
 		--volume $(CARGO_CACHE_VOLUME_NAME):/usr/local/cargo/registry \
 		-e HOME=/tmp \
 		--workdir=/firecracker \
 		localhost/$(FIRECRACKER_BUILDER_NAME):$(DOCKER_IMAGE_TAG) \
-		$(FIRECRACKER_TARGET)
+		cargo build --release \
+		--target-dir=/artifacts --target $(FIRECRACKER_TARGET)
+	cp build/$(FIRECRACKER_TARGET)/release/firecracker $(FIRECRACKER_BIN)
+	cp build/$(FIRECRACKER_TARGET)/release/jailer $(JAILER_BIN)
 
 .PHONY: firecracker-clean
 firecracker-clean:

tools/docker/Dockerfile

@@ -25,6 +25,4 @@ RUN mkdir --mode=0777 --parents /usr/local/cargo/registry
 VOLUME /usr/local/cargo/registry
 
 RUN git clone https://github.com/firecracker-microvm/firecracker.git
-COPY tools/docker/entrypoint.sh /usr/local/bin
 WORKDIR firecracker
-ENTRYPOINT ["entrypoint.sh"]