Merge branch 'main' into kernel

This commit is contained in:
Lance Vick 2024-02-03 04:14:13 -08:00
commit d472f74fe8
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
1 changed files with 3 additions and 4 deletions

View File

@ -39,14 +39,13 @@ define build
--platform $(PLATFORM) \
--progress=plain \
$(if $(filter latest,$(VERSION)),,--build-arg VERSION=$(VERSION)) \
--output type=oci,force-compression=true,name=$(NAME),annotation.org.opencontainers.image.revision=$(REVISION),annotation.org.opencontainers.image.version=$(VERSION),dest=- \
--output type=oci,force-compression=true,name=$(NAME),annotation.org.opencontainers.image.revision=$(REVISION),annotation.org.opencontainers.image.version=$(VERSION),dest=$(basename $@).tar \
--target $(TARGET) \
$(EXTRA_ARGS) \
$(NOCACHE_FLAG) \
src/$(CATEGORY)/$(NAME) \
> $(basename $@).tar.tmp \
&& gzip < $(basename $@).tar.tmp > $@ \
&& rm $(basename $@).tar.tmp \
&& gzip < $(basename $@).tar > $@ \
&& rm $(basename $@).tar \
&& gunzip -c $@ | docker load; \
)
$(eval TIMESTAMP := $(shell TZ=GMT date +"%Y-%m-%dT%H:%M:%SZ"))