Fix docker plugin build (#5240)

- Rebuild the rootfs before each plugin build
grafana · Jan 27, 2022 · 8646436 · 8646436
1 parent a3fcd3c
commit 8646436
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -380,14 +380,25 @@ LOKI_DOCKER_DRIVER ?= "grafana/loki-docker-driver"
 PLUGIN_TAG ?= $(IMAGE_TAG)
 PLUGIN_ARCH ?=
 
-docker-driver: docker-driver-clean
+# build-rootfs
+# builds the plugin rootfs
+define build-rootfs
+	rm -rf clients/cmd/docker-driver/rootfs || true
 	mkdir clients/cmd/docker-driver/rootfs
 	docker build -t rootfsimage -f clients/cmd/docker-driver/Dockerfile .
+
 	ID=$$(docker create rootfsimage true) && \
 	(docker export $$ID | tar -x -C clients/cmd/docker-driver/rootfs) && \
 	docker rm -vf $$ID
+
 	docker rmi rootfsimage -f
+endef
+
+docker-driver: docker-driver-clean
+	$(build-rootfs)
 	docker plugin create $(LOKI_DOCKER_DRIVER):$(PLUGIN_TAG)$(PLUGIN_ARCH) clients/cmd/docker-driver
+
+	$(build-rootfs)
 	docker plugin create $(LOKI_DOCKER_DRIVER):main$(PLUGIN_ARCH) clients/cmd/docker-driver
 
 clients/cmd/docker-driver/docker-driver: $(APP_GO_FILES)