don't gzip unless we have a valid tar file

Dockerfile -> Containerfile
2024-02-05 01:45:45 -08:00 · 2024-02-05 01:45:20 -08:00
40 changed files with 2 additions and 0 deletions
--- a/src/bootstrap/stage0/Containerfile
+++ b/src/bootstrap/stage0/Containerfile
--- a/src/bootstrap/stage1/Containerfile
+++ b/src/bootstrap/stage1/Containerfile
--- a/src/bootstrap/stage2/Containerfile
+++ b/src/bootstrap/stage2/Containerfile
--- a/src/bootstrap/stage3/Containerfile
+++ b/src/bootstrap/stage3/Containerfile
--- a/src/core/_tests/go/Containerfile
+++ b/src/core/_tests/go/Containerfile
--- a/src/core/_tests/perl/Containerfile
+++ b/src/core/_tests/perl/Containerfile
--- a/src/core/_tests/python/Containerfile
+++ b/src/core/_tests/python/Containerfile
--- a/src/core/_tests/rust/Containerfile
+++ b/src/core/_tests/rust/Containerfile
--- a/src/core/autoconf/Containerfile
+++ b/src/core/autoconf/Containerfile
--- a/src/core/automake/Containerfile
+++ b/src/core/automake/Containerfile
--- a/src/core/bash/Containerfile
+++ b/src/core/bash/Containerfile
--- a/src/core/binutils/Containerfile
+++ b/src/core/binutils/Containerfile
--- a/src/core/busybox/Containerfile
+++ b/src/core/busybox/Containerfile
--- a/src/core/cmake/Containerfile
+++ b/src/core/cmake/Containerfile
--- a/src/core/gcc/Containerfile
+++ b/src/core/gcc/Containerfile
--- a/src/core/go/Containerfile
+++ b/src/core/go/Containerfile
--- a/src/core/libtool/Containerfile
+++ b/src/core/libtool/Containerfile
--- a/src/core/libunwind/Containerfile
+++ b/src/core/libunwind/Containerfile
--- a/src/core/linux-headers/Containerfile
+++ b/src/core/linux-headers/Containerfile
--- a/src/core/llvm/Containerfile
+++ b/src/core/llvm/Containerfile
--- a/src/core/m4/Containerfile
+++ b/src/core/m4/Containerfile
--- a/src/core/make/Containerfile
+++ b/src/core/make/Containerfile
--- a/src/core/musl/Containerfile
+++ b/src/core/musl/Containerfile
--- a/src/core/ninja/Containerfile
+++ b/src/core/ninja/Containerfile
--- a/src/core/openssl/Containerfile
+++ b/src/core/openssl/Containerfile
--- a/src/core/perl/Containerfile
+++ b/src/core/perl/Containerfile
--- a/src/core/pkgconf/Containerfile
+++ b/src/core/pkgconf/Containerfile
--- a/src/core/py-setuptools/Containerfile
+++ b/src/core/py-setuptools/Containerfile
--- a/src/core/python/Containerfile
+++ b/src/core/python/Containerfile
--- a/src/core/rust/Containerfile
+++ b/src/core/rust/Containerfile
--- a/src/core/sed/Containerfile
+++ b/src/core/sed/Containerfile
--- a/src/core/zlib/Containerfile
+++ b/src/core/zlib/Containerfile
--- a/src/libs/ca-certificates/Containerfile
+++ b/src/libs/ca-certificates/Containerfile
--- a/src/libs/libxml2/Containerfile
+++ b/src/libs/libxml2/Containerfile
--- a/src/macros.mk
+++ b/src/macros.mk
@ -43,7 +43,9 @@ define build
 			--target $(TARGET) \
 			$(EXTRA_ARGS) \
 			$(NOCACHE_FLAG) \
+			-f src/$(CATEGORY)/$(NAME)/Containerfile \
 			src/$(CATEGORY)/$(NAME) \
+			&& tar -tf $(basename $@).tar \
 			&& gzip < $(basename $@).tar > $@ \
 			&& rm $(basename $@).tar \
 			&& gunzip -c $@ | docker load; \
--- a/src/tools/cpio/Containerfile
+++ b/src/tools/cpio/Containerfile
--- a/src/tools/curl/Containerfile
+++ b/src/tools/curl/Containerfile
--- a/src/tools/gen_initramfs/Containerfile
+++ b/src/tools/gen_initramfs/Containerfile
--- a/src/tools/sops/Containerfile
+++ b/src/tools/sops/Containerfile
--- a/src/tools/tofu/Containerfile
+++ b/src/tools/tofu/Containerfile
Author	SHA1	Message	Date
Lance Vick	cf04bfc6e6	don't gzip unless we have a valid tar file	2024-02-05 01:45:45 -08:00
Lance Vick	77452b3995	Dockerfile -> Containerfile	2024-02-05 01:45:20 -08:00