Merge branch 'main' into kernel
This commit is contained in:
commit
d472f74fe8
|
@ -39,14 +39,13 @@ define build
|
||||||
--platform $(PLATFORM) \
|
--platform $(PLATFORM) \
|
||||||
--progress=plain \
|
--progress=plain \
|
||||||
$(if $(filter latest,$(VERSION)),,--build-arg VERSION=$(VERSION)) \
|
$(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) \
|
--target $(TARGET) \
|
||||||
$(EXTRA_ARGS) \
|
$(EXTRA_ARGS) \
|
||||||
$(NOCACHE_FLAG) \
|
$(NOCACHE_FLAG) \
|
||||||
src/$(CATEGORY)/$(NAME) \
|
src/$(CATEGORY)/$(NAME) \
|
||||||
> $(basename $@).tar.tmp \
|
&& gzip < $(basename $@).tar > $@ \
|
||||||
&& gzip < $(basename $@).tar.tmp > $@ \
|
&& rm $(basename $@).tar \
|
||||||
&& rm $(basename $@).tar.tmp \
|
|
||||||
&& gunzip -c $@ | docker load; \
|
&& gunzip -c $@ | docker load; \
|
||||||
)
|
)
|
||||||
$(eval TIMESTAMP := $(shell TZ=GMT date +"%Y-%m-%dT%H:%M:%SZ"))
|
$(eval TIMESTAMP := $(shell TZ=GMT date +"%Y-%m-%dT%H:%M:%SZ"))
|
||||||
|
|
Reference in New Issue