integration: preserve deployed 1.8.0 OTA work
This commit is contained in:
@@ -10,9 +10,8 @@ pub use health_monitor::HealthMonitor;
|
||||
pub use manifest::{
|
||||
AppInterface, AppManifest, BuildConfig, ContainerConfig, Dependency, DerivedEnv, GeneratedCert,
|
||||
GeneratedFile, GeneratedSecret, HealthCheck, HookStep, HostCopy, HostFacts, LifecycleHooks,
|
||||
ManifestError,
|
||||
ResolvedSource, ResourceLimits, SecretEnv, SecretGenKind, SecretsProvider, SecurityPolicy,
|
||||
Volume,
|
||||
ManifestError, ResolvedSource, ResourceLimits, SecretEnv, SecretGenKind, SecretsProvider,
|
||||
SecurityPolicy, Volume,
|
||||
};
|
||||
pub use podman_client::{
|
||||
image_uses_insecure_registry, ContainerState, ContainerStatus, PodmanClient,
|
||||
|
||||
@@ -1257,7 +1257,10 @@ app:
|
||||
}
|
||||
match &m.app.hooks.post_install[1] {
|
||||
HookStep::CopyFromHost { copy_from_host } => {
|
||||
assert_eq!(copy_from_host.dest, "/usr/share/nginx/html/nostr-provider.js")
|
||||
assert_eq!(
|
||||
copy_from_host.dest,
|
||||
"/usr/share/nginx/html/nostr-provider.js"
|
||||
)
|
||||
}
|
||||
_ => panic!("expected copy_from_host step"),
|
||||
}
|
||||
|
||||
@@ -169,7 +169,11 @@ impl ContainerRuntime for PodmanRuntime {
|
||||
}
|
||||
|
||||
async fn stop_container_with_grace(&self, name: &str, grace_secs: u64) -> Result<()> {
|
||||
match self.client.stop_container_with_grace(name, grace_secs).await {
|
||||
match self
|
||||
.client
|
||||
.stop_container_with_grace(name, grace_secs)
|
||||
.await
|
||||
{
|
||||
Ok(()) => Ok(()),
|
||||
Err(api_err) => {
|
||||
// CLI fallback. Keep the wrapper deadline strictly above the
|
||||
@@ -897,7 +901,9 @@ impl ContainerRuntime for AutoRuntime {
|
||||
}
|
||||
|
||||
async fn stop_container_with_grace(&self, name: &str, grace_secs: u64) -> Result<()> {
|
||||
self.runtime.stop_container_with_grace(name, grace_secs).await
|
||||
self.runtime
|
||||
.stop_container_with_grace(name, grace_secs)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn remove_container(&self, name: &str) -> Result<()> {
|
||||
|
||||
Reference in New Issue
Block a user