Merge branch 'main' into fix/wait-for-log-consumers

Author: DDtKey

.cargo/audit.toml

@@ -0,0 +1,9 @@
+[advisories]
+ignore = [
+  # This advisory comes from `russh -> rsa` which is optional dependency
+  "RUSTSEC-2023-0071",
+]
+
+[output]
+deny = ["warnings"]
+quiet = false

.github/workflows/audit.yml

@@ -0,0 +1,20 @@
+name: Security audit
+on:
+  workflow_dispatch:
+  push:
+    paths: 
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+jobs:
+  security_audit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Generate Cargo.lock if doesn't exist
+        run: |
+          if [ ! -f Cargo.lock ]; then
+            cargo generate-lockfile
+          fi
+      - uses: rustsec/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [ main ]
+    branches: [main]
 
 concurrency:
   group: ${{ github.ref }}
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - uses: Swatinem/rust-cache@v2
       - name: Get current MSRV from Cargo.toml
         id: current_msrv
@@ -32,7 +32,7 @@ jobs:
         with:
           tool: cargo-hack
       - name: Build
-        run: cargo hack build --each-feature --keep-going
+        run: cargo hack build --feature-powerset --depth 2 --clean-per-run
 
   test:
     name: Test
@@ -43,9 +43,14 @@ jobs:
         toolchain:
           - stable
           - nightly
+        partition:
+          - 1/4
+          - 2/4
+          - 3/4
+          - 4/4
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - uses: Swatinem/rust-cache@v2
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master
@@ -62,14 +67,14 @@ jobs:
         with:
           tool: cargo-hack
       - name: Tests
-        run: cargo hack test --each-feature --clean-per-run
+        run: cargo hack test --feature-powerset --depth 2 --clean-per-run --partition ${{ matrix.partition }}
 
   fmt:
     name: Rustfmt check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/toolchain@v1
         with:
@@ -94,7 +99,7 @@ jobs:
           - nightly
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - uses: Swatinem/rust-cache@v2
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master
@@ -112,7 +117,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - uses: CondeNast/[email protected]

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Install Rust toolchain

CHANGELOG.md

@@ -2,6 +2,117 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.25.2] - 2025-10-27
+### Details
+#### Features
+- Platform config passing through ImageExt trait ([#838](https://github.com/testcontainers/testcontainers-rs/pull/838))
+
+#### Miscellaneous Tasks
+- Remove usage of reqwest hickory dns feature ([#860](https://github.com/testcontainers/testcontainers-rs/pull/860))
+- Drop weak dependencies due to cargo bug ([#862](https://github.com/testcontainers/testcontainers-rs/pull/862))
+
+## [0.25.1] - 2025-10-27
+### Details
+#### Bug Fixes
+- Replace tokio-tar with astral-tokio-tar ([#852](https://github.com/testcontainers/testcontainers-rs/pull/852))
+
+#### Documentation
+- Rustdoc for builder API ([#820](https://github.com/testcontainers/testcontainers-rs/pull/820))
+
+#### Features
+- Use DOCKER_DEFAULT_PLATFORM env var to specify platform ([#800](https://github.com/testcontainers/testcontainers-rs/pull/800))
+- Fallback to platform linux/amd64 when image pull fails ([#837](https://github.com/testcontainers/testcontainers-rs/pull/837))
+- Add support for devices request ([#832](https://github.com/testcontainers/testcontainers-rs/pull/832))
+- Add configurable tmpfs mount sizes ([#853](https://github.com/testcontainers/testcontainers-rs/pull/853))
+- Support `http_wait` functionallity without tls dependencies ([#850](https://github.com/testcontainers/testcontainers-rs/pull/850))
+- Add container hostname support ([#848](https://github.com/testcontainers/testcontainers-rs/pull/848))
+- Expose host ports between host and containers via ssh sidecar ([#846](https://github.com/testcontainers/testcontainers-rs/pull/846))
+
+#### Miscellaneous Tasks
+- Update bollard-stubs requirement from =1.48.3-rc.28.0.4 to =1.49.0-rc.28.3.3 ([#828](https://github.com/testcontainers/testcontainers-rs/pull/828))
+
+#### Refactor
+- Remove bollard_stubs dependency as bollard re-exports it ([#844](https://github.com/testcontainers/testcontainers-rs/pull/844))
+
+#### Testing
+- Avoid flakiness in `platform` test
+- Switch to testcontainers/helloworld and reduce some flakiness ([#855](https://github.com/testcontainers/testcontainers-rs/pull/855))
+
+## [0.25.0] - 2025-07-27
+### Details
+#### Bug Fixes
+- Make tls features optional ([#806](https://github.com/testcontainers/testcontainers-rs/pull/806))
+- Add `Send` trait to `stderr` & `stdout` of `ExecResult` ([#809](https://github.com/testcontainers/testcontainers-rs/pull/809))
+- Added new parse rule for correctly parsing ports without protocol specifier ([#812](https://github.com/testcontainers/testcontainers-rs/pull/812))
+
+#### Features
+- Allow ready conditions customization via ImageExt ([#794](https://github.com/testcontainers/testcontainers-rs/pull/794))
+- Allow to wait for log line on either stdout or stderr ([#795](https://github.com/testcontainers/testcontainers-rs/pull/795))
+- Add `Container*::exit_code` ([#791](https://github.com/testcontainers/testcontainers-rs/pull/791))
+- Add `Container*::is_running` ([#790](https://github.com/testcontainers/testcontainers-rs/pull/790))
+- Add custom health check support for containers ([#816](https://github.com/testcontainers/testcontainers-rs/pull/816))
+- Introduce container builder api ([#801](https://github.com/testcontainers/testcontainers-rs/pull/801))
+
+#### Miscellaneous Tasks
+- [❗] Update bollard to 1.19.1 ([#817](https://github.com/testcontainers/testcontainers-rs/pull/817))
+
+#### Refactor
+- Testimages and tests to use builder API ([#804](https://github.com/testcontainers/testcontainers-rs/pull/804))
+## [0.24.0] - 2025-05-04
+### Details
+#### Features
+- Support waiting for commands exit regardless of exit code (#771)
+- Add user configuration for container commands (#784)
+- Add option to stop containers with a timeout (#779)
+- Support `pause` and `unpause` container (#785)
+- Allow `security_opt` and `readonly_rootfs` to be configured (#787)
+
+#### Miscellaneous Tasks
+- Update etcetera requirement from 0.8.0 to 0.9.0 (#773)
+- Update etcetera requirement from 0.9.0 to 0.10.0 (#775)
+## [0.23.3] - 2025-02-19
+### Details
+#### Bug Fixes
+- Proper handling of possible stdin in logs stream (#769)
+
+#### Features
+- Re-export bollard
+## [0.23.2] - 2025-02-06
+### Details
+#### Documentation
+- Add examples of `ImageExt` usage and cover `GenericImage` (#747)
+
+#### Features
+- Add `cap_add` and `cap_drop` support (#726)
+- Add support for user-configured labels (#756)
+- Reusable containers (#757)
+- Add image hook to run commands before ready (#766)
+
+#### Miscellaneous Tasks
+- Update thiserror requirement from 1.0.60 to 2.0.3 (#754)
+- Bump the bollard dep to latest (#759)
+
+#### Testing
+- Deflake the test `start_containers_in_parallel` (#748)
+## [0.23.1] - 2024-09-26
+### Details
+#### Features
+- Expose configured bollard client ([#740](https://github.com/testcontainers/testcontainers-rs/pull/740))
+## [0.23.0] - 2024-09-25
+### Details
+#### Bug Fixes
+- Expose public `copy` types ([#734](https://github.com/testcontainers/testcontainers-rs/pull/734))
+- Typo in an error variant ([#738](https://github.com/testcontainers/testcontainers-rs/pull/738))
+
+#### Features
+- Support copy files to container ([#730](https://github.com/testcontainers/testcontainers-rs/pull/730))
+- Support copying directories to container ([#735](https://github.com/testcontainers/testcontainers-rs/pull/735))
+
+#### Miscellaneous Tasks
+- Copy-to-container interface improvements ([#732](https://github.com/testcontainers/testcontainers-rs/pull/732))
+
+#### Refactor
+- Replace dirs crate with etcetera ([#736](https://github.com/testcontainers/testcontainers-rs/pull/736))
 ## [0.22.0] - 2024-08-30
 ### Details
 #### Bug Fixes

Cargo.toml

@@ -1,18 +1,20 @@
 [workspace]
 resolver = "2"
-members = [
-    "testcontainers",
-    "testimages",
-]
+members = ["testcontainers"]
+exclude = ["testimages/no_expose_port", "testimages/simple-web-server"]
 
 [workspace.package]
-authors = ["Thomas Eizinger", "Artem Medvedev <[email protected]>", "Mervyn McCreight"]
+authors = [
+    "Thomas Eizinger",
+    "Artem Medvedev <[email protected]>",
+    "Mervyn McCreight",
+]
 edition = "2021"
-keywords = ["docker", "testcontainers"]
+keywords = ["docker", "testcontainers", "docker-compose"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/testcontainers/testcontainers-rs"
-rust-version = "1.75"
+rust-version = "1.88"
 
-[workspace.dependencies]
-testimages = { path = "testimages" }
+[patch.crates-io]
+bollard = { git = "https://github.com/DDtKey/bollard.git", branch = "fix/providerless-session" }

Pipfile.lock

@@ -22,31 +22,35 @@ The crate provides an API for working with containers in a test environment.
 - Blocking API (under `blocking` feature)
 
 ```rust
-use testcontainers::{core::{IntoContainerPort, WaitFor}, runners::SyncRunner, GenericImage};
+use testcontainers::{core::{IntoContainerPort, WaitFor}, runners::SyncRunner, GenericImage, ImageExt};
 
 #[test]
 fn test_redis() {
     let container = GenericImage::new("redis", "7.2.4")
         .with_exposed_port(6379.tcp())
         .with_wait_for(WaitFor::message_on_stdout("Ready to accept connections"))
+        .with_network("bridge")
+        .with_env_var("DEBUG", "1")
         .start()
-        .expect("Redis started");
+        .expect("Failed to start Redis");
 }
 ```
 
 - Async API
 
 ```rust
-use testcontainers::{core::{IntoContainerPort, WaitFor}, runners::AsyncRunner, GenericImage};
+use testcontainers::{core::{IntoContainerPort, WaitFor}, runners::AsyncRunner, GenericImage, ImageExt};
 
 #[tokio::test]
 async fn test_redis() {
     let container = GenericImage::new("redis", "7.2.4")
         .with_exposed_port(6379.tcp())
         .with_wait_for(WaitFor::message_on_stdout("Ready to accept connections"))
+        .with_network("bridge")
+        .with_env_var("DEBUG", "1")
         .start()
         .await
-        .expect("Redis started");
+        .expect("Failed to start Redis");
 }
 ```