From c042d897964677d43d15c2f994faca0adc3c290f Mon Sep 17 00:00:00 2001 From: Vaughn Dice Date: Thu, 29 Feb 2024 09:52:50 -0700 Subject: [PATCH] feat(oci): update dkregistry dep to support ACR login Signed-off-by: Vaughn Dice --- Cargo.lock | 7 +++---- crates/oci/Cargo.toml | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d7d1535590..4e80c1ece8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1743,13 +1743,12 @@ dependencies = [ [[package]] name = "dkregistry" version = "0.5.1-alpha.0" -source = "git+https://github.com/camallo/dkregistry-rs?rev=37acecb4b8139dd1b1cc83795442f94f90e1ffc5#37acecb4b8139dd1b1cc83795442f94f90e1ffc5" +source = "git+https://github.com/fermyon/dkregistry-rs?rev=161cf2b66996ed97c7abaf046e38244484814de3#161cf2b66996ed97c7abaf046e38244484814de3" dependencies = [ "async-stream", "base64 0.13.1", "bytes", "futures", - "http 0.2.11", "libflate", "log", "mime", @@ -3264,9 +3263,9 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libflate" -version = "1.4.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" +checksum = "05605ab2bce11bcfc0e9c635ff29ef8b2ea83f29be257ee7d730cac3ee373093" dependencies = [ "adler32", "crc32fast", diff --git a/crates/oci/Cargo.toml b/crates/oci/Cargo.toml index 33dfa5d90f..0fcbf30fb6 100644 --- a/crates/oci/Cargo.toml +++ b/crates/oci/Cargo.toml @@ -10,7 +10,9 @@ async-compression = "0.4.3" # Fork with nested async-std dependency bumped to satisfy Windows build; branch/revision is protected async-tar = { git = "https://github.com/vdice/async-tar", rev = "71e037f9652971e7a55b412a8e47a37b06f9c29d" } base64 = "0.21" -dkregistry = { git = "https://github.com/camallo/dkregistry-rs", rev = "37acecb4b8139dd1b1cc83795442f94f90e1ffc5" } +# Fork with updated auth to support ACR login +# Ref https://github.com/camallo/dkregistry-rs/pull/263 +dkregistry = { git = "https://github.com/fermyon/dkregistry-rs", rev = "161cf2b66996ed97c7abaf046e38244484814de3" } docker_credential = "1.0" dirs = "4.0" futures-util = "0.3"