diff --git a/Cargo.lock b/Cargo.lock index 33b2f95..f3dab1b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -286,7 +286,7 @@ dependencies = [ [[package]] name = "core-dump-composer" -version = "8.6.0" +version = "8.7.0" dependencies = [ "advisory-lock", "anyhow", @@ -380,6 +380,12 @@ dependencies = [ "syn", ] +[[package]] +name = "destructure_traitobject" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" + [[package]] name = "digest" version = "0.10.3" @@ -854,8 +860,7 @@ checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" [[package]] name = "log4rs" version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "893eaf59f4bef8e2e94302adf56385db445a0306b9823582b0b8d5a06d8822f3" +source = "git+https://github.com/No9/log4rs/?branch=typemap-ors-fix#6e3af6876a8178ddd6c0d43440ff22f08d6d0d77" dependencies = [ "anyhow", "arc-swap", @@ -873,7 +878,7 @@ dependencies = [ "serde_yaml", "thiserror", "thread-id", - "typemap", + "typemap-ors", "winapi", ] @@ -1860,12 +1865,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "traitobject" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" - [[package]] name = "try-lock" version = "0.2.3" @@ -1873,12 +1872,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] -name = "typemap" -version = "0.3.3" +name = "typemap-ors" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867" dependencies = [ - "unsafe-any", + "unsafe-any-ors", ] [[package]] @@ -1909,12 +1908,12 @@ dependencies = [ ] [[package]] -name = "unsafe-any" -version = "0.4.2" +name = "unsafe-any-ors" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad" dependencies = [ - "traitobject", + "destructure_traitobject", ] [[package]] diff --git a/charts/core-dump-handler/Chart.yaml b/charts/core-dump-handler/Chart.yaml index fceadd2..e826091 100644 --- a/charts/core-dump-handler/Chart.yaml +++ b/charts/core-dump-handler/Chart.yaml @@ -10,9 +10,9 @@ sources: type: application -version: v8.6.1 +version: v8.7.0 -appVersion: "v8.6.1" +appVersion: "v8.7.0" icon: https://raw.githubusercontent.com/No9/core-dump-handler/master/assets/handle-with-care-svgrepo-com.svg @@ -30,18 +30,18 @@ maintainers: annotations: artifacthub.io/changes: | - kind: added - description: Allow mounting the host container runtime socket + description: Wrap the composer process with in a thread to support time outs links: - name: GitHub PR - url: https://github.com/IBM/core-dump-handler/pull/104 + url: https://github.com/IBM/core-dump-handler/pull/111 - kind: added - description: Update security documentation and Integration test docs + description: Update log4rs to support newer deps links: - name: GitHub PR - url: https://github.com/IBM/core-dump-handler/pull/107 + url: https://github.com/IBM/core-dump-handler/pull/112 artifacthub.io/images: | - name: core-dump-handler - image: quay.io/icdh/core-dump-handler:v8.6.1 + image: quay.io/icdh/core-dump-handler:v8.7.0 artifacthub.io/license: MIT artifacthub.io/signKey: | fingerprint: BED079E67FD431E45301B1C9949E671B46AC8A34 diff --git a/charts/core-dump-handler/values.yaml b/charts/core-dump-handler/values.yaml index 15a9e07..437b68d 100644 --- a/charts/core-dump-handler/values.yaml +++ b/charts/core-dump-handler/values.yaml @@ -3,7 +3,7 @@ replicaCount: 1 image: registry: quay.io repository: icdh/core-dump-handler - tag: v8.6.1 + tag: v8.7.0 pullPolicy: Always pullSecrets: [] request_mem: "64Mi" diff --git a/core-dump-composer/Cargo.toml b/core-dump-composer/Cargo.toml index 714f11b..922ad96 100644 --- a/core-dump-composer/Cargo.toml +++ b/core-dump-composer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "core-dump-composer" -version = "8.6.0" +version = "8.7.0" authors = ["Anthony Whalley "] edition = "2021" @@ -13,7 +13,7 @@ uuid = { version = "1.1.0", features = ["serde", "v4"] } zip = "0.6.2" dotenv = "0.15.0" log = "0.4.14" -log4rs = "1.1.1" +log4rs = { git = "https://github.com/No9/log4rs/", branch = "typemap-ors-fix" } anyhow = "1.0.53" serde_json = "1.0.76" serde = { version = "1.0.134", features = ["derive"] }