Skip to content

Commit

Permalink
3.125.2 (#2946)
Browse files Browse the repository at this point in the history
* 3.125.2

* Update mirrord/cli/src/container.rs
  • Loading branch information
aviramha authored Nov 28, 2024
1 parent 4e4adb6 commit 8eb7a16
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 32 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,20 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang

<!-- towncrier release notes start -->

## [3.125.2](https://github.com/metalbear-co/mirrord/tree/3.125.2) - 2024-11-29


### Fixed

- Manually call `docker start <sidecar_id>` if after our sidecar `run` command
the container hasn't started yet and is in "created" status.
[#2927](https://github.com/metalbear-co/mirrord/issues/2927)


### Internal

- Fixed return type of a function in mirrord-operator client code.

## [3.125.1](https://github.com/metalbear-co/mirrord/tree/3.125.1) - 2024-11-27


Expand Down
56 changes: 28 additions & 28 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ resolver = "2"

# latest commits on rustls suppress certificate verification
[workspace.package]
version = "3.125.1"
version = "3.125.2"
edition = "2021"
license = "MIT"
readme = "README.md"
Expand Down
1 change: 0 additions & 1 deletion changelog.d/+type-fix.internal.md

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/2927.fixed.md

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/2944.fixed.md

This file was deleted.

13 changes: 13 additions & 0 deletions mirrord/cli/src/container.rs
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,19 @@ pub(crate) async fn container_command(
.status()
.await;

// Keep the files, since this process is going to exit before the new process is actually run
// and uses them perhaps find a way to clean up? (can't wait for container to boot
// successfuly since when it loads other processes it might need it too)
if let Some((cert, key)) = _internal_proxy_tls_guards {
if let Err(err) = cert.keep() {
tracing::warn!(?err, "failed to keep internal proxy certificate");
}

if let Err(err) = key.keep() {
tracing::warn!(?err, "failed to keep internal proxy key");
}
}

if let Err(err) = composed_config_file.keep() {
tracing::warn!(?err, "failed to keep composed config file");
}
Expand Down

0 comments on commit 8eb7a16

Please sign in to comment.