Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ license = "MIT OR Apache-2.0"
name = "containers-image-proxy"
readme = "README.md"
repository = "https://github.com/containers/containers-image-proxy-rs"
version = "0.5.9"
version = "0.6.0"
rust-version = "1.70.0"

[dependencies]
anyhow = "1.0"
fn-error-context = "0.2.0"
futures-util = "0.3.13"
# NOTE when bumping this in a semver-incompatible way, because we re-export it you
# must also bump the semver of this project.
oci-spec = "0.6.5"
rustix = { version = "0.38", features = ["process", "net"] }
serde = { features = ["derive"], version = "1.0.125" }
Expand All @@ -28,7 +30,3 @@ clap = { version = "4.4", features = ["derive"] }

[lib]
path = "src/imageproxy.rs"

[features]
# See https://github.com/containers/skopeo/blob/03da797e42374892bca8759668adb0b06d087876/cmd/skopeo/proxy.go#L95
proxy_v0_2_4 = []
4 changes: 0 additions & 4 deletions src/imageproxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ use tracing::instrument;
/// Re-export because we use this in our public APIs
pub use oci_spec;

pub const OCI_TYPE_LAYER_GZIP: &str = "application/vnd.oci.image.layer.v1.tar+gzip";
pub const OCI_TYPE_LAYER_TAR: &str = "application/vnd.oci.image.layer.v1.tar";

/// File descriptor range which is reserved for passing data down into the proxy;
/// avoid configuring the command to use files in this range. (Also, stdin is
/// reserved)
Expand Down Expand Up @@ -399,7 +396,6 @@ impl ImageProxy {
}

#[instrument]
#[cfg(feature = "proxy_v0_2_4")]
pub async fn open_image_optional(&self, imgref: &str) -> Result<Option<OpenedImage>> {
tracing::debug!("opening image");
let (imgid, _) = self
Expand Down