From 0b616a629affc2fed93ab331139d3bf7898c970b Mon Sep 17 00:00:00 2001 From: Justin Kromlinger Date: Sat, 7 Nov 2020 16:50:03 +0100 Subject: [PATCH] Always build rootfs archives before the Dockerfiles The Dockerfiles require them for their sha256sum. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0d556f3..06477fc 100644 --- a/Makefile +++ b/Makefile @@ -51,16 +51,16 @@ $(OUTPUTDIR)/base.tar.xz: $(OUTPUTDIR)/base-devel.tar.xz: $(call rootfs,base-devel,base base-devel) -$(OUTPUTDIR)/Dockerfile.base: +$(OUTPUTDIR)/Dockerfile.base: $(OUTPUTDIR)/base.tar.xz $(call dockerfile,base) -$(OUTPUTDIR)/Dockerfile.base-devel: +$(OUTPUTDIR)/Dockerfile.base-devel: $(OUTPUTDIR)/base-devel.tar.xz $(call dockerfile,base-devel) .PHONY: docker-image-base -image-base: $(OUTPUTDIR)/base.tar.xz $(OUTPUTDIR)/Dockerfile.base +image-base: $(OUTPUTDIR)/Dockerfile.base docker build -f $(OUTPUTDIR)/Dockerfile.base -t archlinux/archlinux:base $(OUTPUTDIR) .PHONY: docker-image-base-devel -image-base-devel: $(OUTPUTDIR)/base-devel.tar.xz $(OUTPUTDIR)/Dockerfile.base-devel +image-base-devel: $(OUTPUTDIR)/Dockerfile.base-devel docker build -f $(OUTPUTDIR)/Dockerfile.base-devel -t archlinux/archlinux:base-devel $(OUTPUTDIR)