From cf1882860f6fcc7fee3bb4e8b198c5ef6fb06231 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 06:02:24 +0000 Subject: [PATCH 1/2] build(deps): bump testcontainers from 0.14.0 to 0.15.0 Bumps [testcontainers](https://github.com/testcontainers/testcontainers-rs) from 0.14.0 to 0.15.0. - [Release notes](https://github.com/testcontainers/testcontainers-rs/releases) - [Changelog](https://github.com/testcontainers/testcontainers-rs/blob/0.15/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-rs/compare/0.14.0...0.15) --- updated-dependencies: - dependency-name: testcontainers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 9 ++++----- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bfb5aec3..07d50a00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -435,11 +435,10 @@ dependencies = [ [[package]] name = "bollard-stubs" -version = "1.41.0" +version = "1.42.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8" +checksum = "ed59b5c00048f48d7af971b71f800fdf23e858844a6f9e4d32ca72e9399e7864" dependencies = [ - "chrono", "serde", "serde_with 1.14.0", ] @@ -4563,9 +4562,9 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "testcontainers" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e2b1567ca8a2b819ea7b28c92be35d9f76fb9edb214321dcc86eb96023d1f87" +checksum = "f83d2931d7f521af5bae989f716c3fa43a6af9af7ec7a5e21b59ae40878cec00" dependencies = [ "bollard-stubs", "futures", diff --git a/Cargo.toml b/Cargo.toml index 78b765d0..11e73552 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,4 +58,4 @@ rstest = "0.18.2" tempfile = "3.8.0" assert_cmd = "2.0.12" predicates = "3.0.4" -testcontainers = "0.14" +testcontainers = "0.15" From 8fb837cac4df0675bfbba407c6da3760a197ae29 Mon Sep 17 00:00:00 2001 From: Flavio Castelli Date: Mon, 9 Oct 2023 12:24:24 +0200 Subject: [PATCH 2/2] chore(dep): fix usage of testcontainers Use the new API exposed by the crate Signed-off-by: Flavio Castelli --- tests/e2e.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e.rs b/tests/e2e.rs index a84c9edf..c03d2ba6 100644 --- a/tests/e2e.rs +++ b/tests/e2e.rs @@ -4,7 +4,7 @@ use common::{setup_command, test_data}; use predicates::{prelude::*, str::contains, str::is_empty}; use rstest::rstest; use tempfile::tempdir; -use testcontainers::{clients, core::WaitFor, images}; +use testcontainers::{clients, core::WaitFor}; mod common; @@ -271,7 +271,7 @@ fn test_save_and_load() { #[test] fn test_push() { let docker = clients::Cli::default(); - let registry_image = images::generic::GenericImage::new("docker.io/library/registry", "2") + let registry_image = testcontainers::GenericImage::new("docker.io/library/registry", "2") .with_wait_for(WaitFor::message_on_stderr("listening on ")); let testcontainer = docker.run(registry_image);