Merge pull request #665 from kzys/exclude-fc

Exclude _submodules/firecracker from the build context

Author: Kazuyoshi Kato

.dockerignore

@@ -1,2 +1,5 @@
 tools/image-builder/rootfs/
 tmp/
+
+_submodules/firecracker/
+!_submodules/firecracker/build/kernel/linux-4.14/*.bin

Makefile

@@ -46,7 +46,7 @@ endif
 FIRECRACKER_TARGET?=$(host_arch)-unknown-linux-musl
 
 FIRECRACKER_DIR=$(SUBMODULES)/firecracker
-FIRECRACKER_BIN=$(FIRECRACKER_DIR)/build/cargo_target/$(FIRECRACKER_TARGET)/release/firecracker
+FIRECRACKER_BIN=bin/firecracker
 FIRECRACKER_BUILDER_NAME?=firecracker-builder
 CARGO_CACHE_VOLUME_NAME?=cargocache
 
@@ -337,6 +337,7 @@ $(FIRECRACKER_DIR)/Cargo.toml:
 $(FIRECRACKER_BIN): $(FIRECRACKER_DIR)/Cargo.toml
 	$(FIRECRACKER_DIR)/tools/devtool -y build --release && \
 		$(FIRECRACKER_DIR)/tools/devtool strip
+	cp $(FIRECRACKER_DIR)/build/cargo_target/$(FIRECRACKER_TARGET)/release/firecracker $@
 
 .PHONY: firecracker-clean
 firecracker-clean:

tools/docker/Dockerfile.integ-test

@@ -56,11 +56,12 @@ RUN wget https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION
   install -D -o root -g root -m755 -t /usr/local/bin /tmp/critest && \
   rm -f critest-$VERSION-linux-amd64.tar.gz /tmp/critest
 
+ADD bin/firecracker /usr/local/bin
+
 # Install everything we need in this image. Due to the bind-mount, if the host has already
 # up-to-date versions of everything built, this step will be a very quick copy
 RUN --mount=type=bind,target=/src make -C /src \
   install \
-  install-firecracker \
   install-runc \
   install-kernel \
   install-default-rootfs \