diff --git a/kernel/Makefile b/kernel/Makefile index c118be5a2..1613d8324 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -122,16 +122,16 @@ fetch: sources/linux-$(1).tar.xz # 'docker build' with the FROM image supplied as --build-arg # *and* with DOCKER_CONTENT_TRUST=1 currently does not work # (https://github.com/moby/moby/issues/34199). So, we pull the image -# with DCT and then build with DOCKER_CONTENT_TRUST explicitly set to 0. +# with DCT as part of the dependency on build_$(2)$(3) and then build +# with DOCKER_CONTENT_TRUST explicitly set to 0 ifneq ($(2), 4.4.x) # perf does not build out of the box for 4.4.x and 4.4.x is not that relevant anymore to work on a fix build_perf_$(2)$(3): build_$(2)$(3) docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) || \ - (docker pull $(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) && \ DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.perf \ --build-arg IMAGE=$(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) \ - --no-cache --network=none $(LABEL) -t $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) .) + --no-cache --network=none $(LABEL) -t $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) . push_perf_$(2)$(3): build_perf_$(2)$(3) @if [ x"$(DIRTY)" != x ]; then echo "Your repository is not clean. Will not push image"; exit 1; fi @@ -151,10 +151,9 @@ ifneq ($(3), -dbg) # is incompatible with CDDL, apparently (this is ./configure check) build_zfs_$(2)$(3): build_$(2)$(3) docker pull $(ORG)/$(IMAGE_ZFS):$(1)$(3)-$(TAG)$(SUFFIX) || \ - (docker pull $(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) && \ DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.zfs \ --build-arg IMAGE=$(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) \ - --no-cache $(LABEL) -t $(ORG)/$(IMAGE_ZFS):$(1)$(3)-$(TAG)$(SUFFIX) .) + --no-cache $(LABEL) -t $(ORG)/$(IMAGE_ZFS):$(1)$(3)-$(TAG)$(SUFFIX) . push_zfs_$(2)$(3): build_zfs_$(2)$(3) @if [ x"$(DIRTY)" != x ]; then echo "Your repository is not clean. Will not push image"; exit 1; fi