robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-04 09:34:08 +02:00
Code Issues Projects Releases Wiki Activity

update bollard

Browse source
This commit is contained in:
Robin Appelman 2026-02-27 22:52:40 +01:00
commit df38f16f10
23 changed files with 410 additions and 502 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/service/office.rs
View file

@ -3,8 +3,10 @@ use crate::config::HazeConfig;
use crate::image::pull_image;
use crate::service::ServiceTrait;
use crate::Result;
use bollard::container::{Config, CreateContainerOptions, NetworkingConfig};
use bollard::models::{ContainerState, EndpointSettings, HostConfig};
use bollard::models::{
ContainerCreateBody, ContainerState, EndpointSettings, HostConfig, NetworkingConfig,
};
use bollard::query_parameters::CreateContainerOptions;
use bollard::Docker;
use maplit::hashmap;
use miette::{IntoDiagnostic, Report};
@ -34,7 +36,7 @@ impl ServiceTrait for Office {
pull_image(docker, image).await?;
let container_id = self.container_name(cloud_id).unwrap();
let options = Some(CreateContainerOptions {
name: container_id.clone(),
name: Some(container_id.clone()),
..CreateContainerOptions::default()
});
let mut env = vec!["extra_params=--o:ssl.enable=false --o:ssl.termination=true"];
@ -54,24 +56,24 @@ impl ServiceTrait for Office {
env.push(&server_name_opt);
}
let config = Config {
image: Some(image),
env: Some(env),
let config = ContainerCreateBody {
image: Some(image.into()),
env: Some(env.into_iter().map(String::from).collect()),
host_config: Some(HostConfig {
network_mode: Some(network.to_string()),
..Default::default()
}),
labels: Some(hashmap! {
"haze-type" => self.name(),
"haze-cloud-id" => cloud_id
"haze-type".into() => self.name().into(),
"haze-cloud-id".into() => cloud_id.into(),
}),
networking_config: Some(NetworkingConfig {
endpoints_config: hashmap! {
network => EndpointSettings {
endpoints_config: Some(hashmap! {
network.into() => EndpointSettings {
aliases: Some(vec![self.name().to_string()]),
..Default::default()
}
},
}),
}),
..Default::default()
};
@ -80,10 +82,7 @@ impl ServiceTrait for Office {
.await
.into_diagnostic()?
.id;
docker
.start_container::<String>(&id, None)
.await
.into_diagnostic()?;
docker.start_container(&id, None).await.into_diagnostic()?;
Ok(vec![id])
}