Merge pull request #203 from seemethere/fix_tar_1809

[18.09] Have the tar target make a docker compat one too
Upstream-commit: 098761f13254bf956a92ebca219aa10b69b8e7d9
Component: packaging

components/packaging/.gitignore

@@ -4,3 +4,5 @@ rpmbuild
 tmp
 artifacts
 sources
+*.tar
+image-linux

components/packaging/image/Makefile

@@ -22,6 +22,8 @@ clean: ## remove build artifacts
 	-$(RM) $(ENGINE_DIR)/Dockerfile.engine
 	-docker rmi $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION)
 	-rm -f image-linux
+	-$(RM) -r artifacts
+	-$(RM) *.tar
 
 .PHONY: image
 image: image-linux
@@ -53,13 +55,15 @@ $(DOCKER2OCI):
 	docker rm -f docker2oci
 	$(CHOWN) -R $(shell id -u):$(shell id -g) $(@D)
 
-engine-$(ARCH).tar: image-linux $(DOCKER2OCI)
+engine-$(ARCH).tar: engine-$(ARCH)-docker-compat.tar $(DOCKER2OCI)
 	mkdir -p artifacts
-	docker save -o artifacts/docker-engine.tar $$(cat image-linux)
-	./$(DOCKER2OCI) -i artifacts/docker-engine.tar artifacts/engine-image
+	./$(DOCKER2OCI) -i $< artifacts/engine-image
 	mkdir -p $(@D)
 	tar c -C artifacts/engine-image . > $@
 
+engine-$(ARCH)-docker-compat.tar: image-linux
+	docker save -o $@ $$(cat $<)
+
 .PHONY: release
 release:
 	docker push $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH)