@@ -810,9 +810,9 @@ compare_sbom_collected_sources: $(COLLECTED_SOURCES) $(SBOM) | $(COMPARESOURCES)
810810publish_sources : $(COLLECTED_SOURCES )
811811 $(QUIET ) : $@ : Begin
812812 cp pkg/sources/* $(SOURCES_DIR )
813- $(LINUXKIT ) $(DASH_V ) pkg $(LINUXKIT_PKG_TARGET ) $(LINUXKIT_ORG_TARGET ) --platforms linux/$(ZARCH ) --hash-path $(CURDIR ) --hash $(ROOTFS_VERSION ) -$(HV ) --docker $(if $(strip $(EVE_REL ) ) ,--release) $(EVE_REL )$(if $(strip $(EVE_REL ) ) ,-$(HV ) ) $(SOURCES_DIR ) $|
813+ $(LINUXKIT ) $(DASH_V ) pkg $(LINUXKIT_PKG_TARGET ) $(LINUXKIT_ORG_TARGET ) --builder-image renezededa/buildkit:latest -- platforms linux/$(ZARCH ) --hash-path $(CURDIR ) --hash $(ROOTFS_VERSION ) -$(HV ) --docker $(if $(strip $(EVE_REL ) ) ,--release) $(EVE_REL )$(if $(strip $(EVE_REL ) ) ,-$(HV ) ) $(SOURCES_DIR ) $|
814814 $(QUIET ) if [ -n " $( EVE_REL) " ] && [ $( HV) = $( HV_DEFAULT) ]; then \
815- $(LINUXKIT ) $(DASH_V ) pkg $(LINUXKIT_PKG_TARGET ) $(LINUXKIT_ORG_TARGET ) --platforms linux/$(ZARCH ) --hash-path $(CURDIR ) --hash $(EVE_REL ) -$(HV ) --docker --release $(EVE_REL ) $(SOURCES_DIR ) $| ; \
815+ $(LINUXKIT ) $(DASH_V ) pkg $(LINUXKIT_PKG_TARGET ) --builder-image renezededa/buildkit:latest $(LINUXKIT_ORG_TARGET ) --platforms linux/$(ZARCH ) --hash-path $(CURDIR ) --hash $(EVE_REL ) -$(HV ) --docker --release $(EVE_REL ) $(SOURCES_DIR ) $| ; \
816816 fi
817817 $(QUIET ) : $@ : Succeeded
818818
@@ -885,9 +885,9 @@ eve: $(INSTALLER) $(EVE_ARTIFACTS) current $(RUNME) $(BUILD_YML) | $(BUILD_DIR)
885885 $(QUIET ) : " $@ : Begin: EVE_REL=$( EVE_REL) , HV=$( HV) , LINUXKIT_PKG_TARGET=$( LINUXKIT_PKG_TARGET) "
886886 cp images/out/* .yml $|
887887 $(PARSE_PKGS ) pkg/eve/Dockerfile.in > $| /Dockerfile
888- $(LINUXKIT ) $(DASH_V ) pkg $(LINUXKIT_PKG_TARGET ) $(LINUXKIT_ORG_TARGET ) --platforms linux/$(ZARCH ) --hash-path $(CURDIR ) --hash $(ROOTFS_VERSION ) -$(HV ) --docker $(if $(strip $(EVE_REL ) ) ,--release) $(EVE_REL )$(if $(strip $(EVE_REL ) ) ,-$(HV ) ) $(FORCE_BUILD ) $|
888+ $(LINUXKIT ) $(DASH_V ) pkg $(LINUXKIT_PKG_TARGET ) --builder-image renezededa/buildkit:latest $(LINUXKIT_ORG_TARGET ) --platforms linux/$(ZARCH ) --hash-path $(CURDIR ) --hash $(ROOTFS_VERSION ) -$(HV ) --docker $(if $(strip $(EVE_REL ) ) ,--release) $(EVE_REL )$(if $(strip $(EVE_REL ) ) ,-$(HV ) ) $(FORCE_BUILD ) $|
889889 $(QUIET ) if [ -n " $( EVE_REL) " ] && [ $( HV) = $( HV_DEFAULT) ]; then \
890- $(LINUXKIT ) $(DASH_V ) pkg $(LINUXKIT_PKG_TARGET ) $(LINUXKIT_ORG_TARGET ) --platforms linux/$(ZARCH ) --hash-path $(CURDIR ) --hash $(EVE_REL ) -$(if $(TAGPLAT ) ,$(TAGPLAT ) -)$(HV ) --docker --release $(EVE_REL ) $(FORCE_BUILD ) $| ; \
890+ $(LINUXKIT ) $(DASH_V ) pkg $(LINUXKIT_PKG_TARGET ) --builder-image renezededa/buildkit:latest $(LINUXKIT_ORG_TARGET ) --platforms linux/$(ZARCH ) --hash-path $(CURDIR ) --hash $(EVE_REL ) -$(if $(TAGPLAT ) ,$(TAGPLAT ) -)$(HV ) --docker --release $(EVE_REL ) $(FORCE_BUILD ) $| ; \
891891 fi
892892 $(QUIET ) : $@ : Succeeded
893893
@@ -1054,7 +1054,7 @@ eve-%: pkg/%/Dockerfile build-tools $(RESCAN_DEPS)
10541054 $(QUIET ) : " $@ : Begin: LINUXKIT_PKG_TARGET=$( LINUXKIT_PKG_TARGET) "
10551055 $(eval LINUXKIT_DOCKER_LOAD := $(if $(filter $(PKGS_DOCKER_LOAD ) ,$* ) ,--docker,) )
10561056 $(eval LINUXKIT_BUILD_PLATFORMS_LIST := $(call uniq,linux/$(ZARCH ) $(if $(filter $(PKGS_HOSTARCH ) ,$* ) ,linux/$(HOSTARCH ) ,) ) )
1057- $(eval LINUXKIT_BUILD_PLATFORMS := --platforms $(subst $(space ) ,$(comma ) ,$(strip $(LINUXKIT_BUILD_PLATFORMS_LIST ) ) ) )
1057+ $(eval LINUXKIT_BUILD_PLATFORMS := --builder-image renezededa/buildkit:latest -- platforms $(subst $(space ) ,$(comma ) ,$(strip $(LINUXKIT_BUILD_PLATFORMS_LIST ) ) ) )
10581058 $(eval LINUXKIT_FLAGS := $(if $(filter manifest,$(LINUXKIT_PKG_TARGET ) ) ,,$(FORCE_BUILD ) $(LINUXKIT_DOCKER_LOAD ) $(LINUXKIT_BUILD_PLATFORMS ) ) )
10591059 $(QUIET )$(LINUXKIT ) $(DASH_V ) pkg $(LINUXKIT_PKG_TARGET ) $(LINUXKIT_ORG_TARGET ) $(LINUXKIT_OPTS ) $(LINUXKIT_FLAGS ) --build-yml $(call get_pkg_build_yml,$* ) pkg/$*
10601060 $(QUIET ) if [ -n " $( PRUNE) " ]; then \
0 commit comments