studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ci: Use fatter layer caching; make script output consistent.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-06-06 19:25:49 +00:00
parent 06f37e9e8a
commit 9bad2fa1eb
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docker/bake.hcl
View File

@@ -631,7 +631,7 @@ target "install" {
] ]
labels = install_labels labels = install_labels
output = ["type=docker,compression=zstd,mode=min,compression-level=${zstd_image_compress_level}"] output = ["type=docker,compression=zstd,mode=min,compression-level=${zstd_image_compress_level}"]
cache_to = ["type=local,compression=zstd,mode=min,compression-level=${cache_compress_level}"] cache_to = ["type=local,compression=zstd,mode=max,compression-level=${cache_compress_level}"]
dockerfile = "${docker_dir}/Dockerfile.install" dockerfile = "${docker_dir}/Dockerfile.install"
target = "install" target = "install"
matrix = cargo_rust_feat_sys matrix = cargo_rust_feat_sys
@@ -1025,7 +1025,7 @@ target "cargo" {
name = elem("cargo", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]) name = elem("cargo", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target])
target = "cargo" target = "cargo"
output = ["type=cacheonly,compression=zstd,mode=min,compression-level=${cache_compress_level}"] output = ["type=cacheonly,compression=zstd,mode=min,compression-level=${cache_compress_level}"]
cache_to = ["type=local,compression=zstd,mode=min,compression-level=${cache_compress_level}"] cache_to = ["type=local,compression=zstd,mode=max,compression-level=${cache_compress_level}"]
dockerfile = "${docker_dir}/Dockerfile.cargo" dockerfile = "${docker_dir}/Dockerfile.cargo"
matrix = cargo_rust_feat_sys matrix = cargo_rust_feat_sys
inherits = [ inherits = [
@@ -1128,7 +1128,7 @@ target "deps-base" {
] ]
target = "deps" target = "deps"
output = ["type=cacheonly,compression=zstd,mode=min,compression-level=${cache_compress_level}"] output = ["type=cacheonly,compression=zstd,mode=min,compression-level=${cache_compress_level}"]
cache_to = ["type=local,compression=zstd,mode=min,compression-level=${cache_compress_level}"] cache_to = ["type=local,compression=zstd,mode=max,compression-level=${cache_compress_level}"]
dockerfile = "${docker_dir}/Dockerfile.cargo.deps" dockerfile = "${docker_dir}/Dockerfile.cargo.deps"
matrix = cargo_rust_feat_sys matrix = cargo_rust_feat_sys
inherits = [ inherits = [
@@ -1333,7 +1333,7 @@ target "ingredients" {
elem_tag("ingredients", [rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target], "latest"), elem_tag("ingredients", [rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target], "latest"),
] ]
target = "ingredients" target = "ingredients"
cache_to = ["type=local,compression=zstd,mode=min"] cache_to = ["type=local,compression=zstd,mode=max"]
matrix = rust_feat_sys matrix = rust_feat_sys
inherits = [ inherits = [
elem("kitchen", [feat_set, sys_name, sys_version, sys_target]), elem("kitchen", [feat_set, sys_name, sys_version, sys_target]),
@@ -1657,7 +1657,7 @@ target "system" {
] ]
target = "system" target = "system"
output = ["type=cacheonly,compression=zstd,mode=min,compression-level=${cache_compress_level}"] output = ["type=cacheonly,compression=zstd,mode=min,compression-level=${cache_compress_level}"]
cache_to = ["type=local,compression=zstd,mode=min,compression-level=${cache_compress_level}"] cache_to = ["type=local,compression=zstd,mode=max,compression-level=${cache_compress_level}"]
cache_from = ["type=local"] cache_from = ["type=local"]
dockerfile = "${docker_dir}/Dockerfile.system" dockerfile = "${docker_dir}/Dockerfile.system"
matrix = sys matrix = sys

6
docker/complement.sh
View File

@@ -45,7 +45,7 @@ fi
docker rm -f "$name" 2>/dev/null docker rm -f "$name" 2>/dev/null
trap 'set +x; date; echo -e "\033[1;41;37mFAIL\033[0m"' ERR trap 'set +x; date; echo -e "\033[1;41;37mERROR\033[0m"' ERR
if test "$CI" = "true"; then if test "$CI" = "true"; then
arg="-d $arg" arg="-d $arg"
@@ -58,8 +58,8 @@ fi
echo -n "$cid" > "$name" echo -n "$cid" > "$name"
trap 'docker container stop $cid; set +x; date; echo -e "\033[1;41;37mFAIL\033[0m"' INT trap 'docker container stop $cid; set +x; date; echo -e "\033[1;41;37mERROR\033[0m"' INT
docker logs -f "$cid" docker logs -f "$cid"
docker wait "$cid" 2>/dev/null docker wait "$cid" 2>/dev/null
echo -e "\033[1;42;30mPASS\033[0m" echo -e "\033[1;42;30mACCEPT\033[0m"