diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74d9785b..cf4aa738 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - build --all-features - build --no-default-features steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get current MSRV from Cargo.toml id: current_msrv run: | @@ -25,7 +25,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: toolchain: ${{steps.current_msrv.outputs.msrv}} - - uses: Swatinem/rust-cache@v2.5.0 + - uses: Swatinem/rust-cache@v2.7.0 - run: cargo ${{ matrix['cargo-cmd'] }} test: @@ -37,7 +37,7 @@ jobs: - test --all-features - test --no-default-features steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Enable Docker Remote API on Localhost shell: bash run: | @@ -46,21 +46,21 @@ jobs: sudo systemctl daemon-reload sudo systemctl restart docker - uses: dtolnay/rust-toolchain@stable - - uses: Swatinem/rust-cache@v2.5.0 + - uses: Swatinem/rust-cache@v2.7.0 - run: cargo ${{ matrix['cargo-cmd'] }} style: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dprint/check@v2.2 lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@1.67 with: components: clippy - - uses: Swatinem/rust-cache@v2.5.0 + - uses: Swatinem/rust-cache@v2.7.0 - run: cargo clippy --all-targets -- -D warnings diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 206c1818..e9ada75c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -4,19 +4,19 @@ jobs: nightly-tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 id: toolchain with: profile: minimal toolchain: nightly override: true - - uses: Swatinem/rust-cache@v2.5.0 + - uses: Swatinem/rust-cache@v2.7.0 - run: cargo test nightly-lints: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 id: toolchain with: @@ -24,5 +24,5 @@ jobs: toolchain: nightly override: true components: clippy - - uses: Swatinem/rust-cache@v2.5.0 + - uses: Swatinem/rust-cache@v2.7.0 - run: cargo clippy --all-targets -- -D warnings diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml index 1a782c3c..4a31b12f 100644 --- a/.github/workflows/publish-new-release.yml +++ b/.github/workflows/publish-new-release.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout merge commit - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.merge_commit_sha }} @@ -65,7 +65,7 @@ jobs: echo "::set-output name=version::$VERSION" - name: Create pull request for merging release-branch back into dev - uses: thomaseizinger/create-pull-request@1.3.0 + uses: thomaseizinger/create-pull-request@1.3.1 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} head: release/${{ steps.extract-version.outputs.version }} diff --git a/testcontainers/src/clients/cli.rs b/testcontainers/src/clients/cli.rs index 4cb2ca84..37e58d64 100644 --- a/testcontainers/src/clients/cli.rs +++ b/testcontainers/src/clients/cli.rs @@ -44,8 +44,13 @@ impl Cli { log::debug!("Executing command: {:?}", command); let output = command.output().expect("Failed to execute docker command"); + if !output.status.success() { + let stdout = std::str::from_utf8(&output.stdout).unwrap_or("{not utf8}"); + let stderr = std::str::from_utf8(&output.stderr).unwrap_or("{not utf8}"); + log::error!("Failed to start container.\nContainer stdout: {stdout}\nContainer stderr: {stderr}"); + panic!("Failed to start container, check log for details") + } - assert!(output.status.success(), "failed to start container"); let container_id = String::from_utf8(output.stdout) .expect("output is not valid utf8") .trim() diff --git a/testimages/Cargo.toml b/testimages/Cargo.toml index 3da8ef54..c8ec4850 100644 --- a/testimages/Cargo.toml +++ b/testimages/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0.56" -axum = { version = "0.5.1", features = [ "http2" ] } +axum = { version = "0.6.20", features = [ "http2" ] } tokio = { version = "1.17.0", features = [ "full" ] } [build-dependencies]