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

fix integration not using all passed options

Browse source
This commit is contained in:
Robin Appelman 2026-02-27 17:07:37 +01:00
commit 8941c697fb
2 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nix/image/bootstrap.sh
View file

@ -4,6 +4,7 @@ touch /var/log/nginx/access.log
touch /var/log/nginx/error.log touch /var/log/nginx/error.log
touch /var/log/cron/owncloud.log touch /var/log/cron/owncloud.log
mkdir -p /config
echo "# Options in here overwrite the builtin php.ini" > /config/php.ini echo "# Options in here overwrite the builtin php.ini" > /config/php.ini
echo "# xdebug.mode = debug" >> /config/php.ini echo "# xdebug.mode = debug" >> /config/php.ini
echo "# xdebug.start_with_request = yes" >> /config/php.ini echo "# xdebug.start_with_request = yes" >> /config/php.ini

22
src/main.rs
View file

@ -269,26 +269,8 @@ async fn main() -> Result<ExitCode> {
return Ok(result.into()); return Ok(result.into());
} }
HazeArgs::Integration { options, mut args } => { HazeArgs::Integration { options, mut args } => {
let cloud = Cloud::create(&docker, options, &config).await?; let cloud = setup(&docker, options, &config).await?;
println!("Waiting for servers to start");
cloud.wait_for_start(&docker).await?;
println!("Installing");
if let Err(e) = cloud
.exec(
&docker,
vec![
"install",
&config.auto_setup.username,
&config.auto_setup.password,
],
false,
Vec::<String>::default(),
)
.await
{
cloud.destroy(&docker).await?;
return Err(e);
}
args.insert(0, "integration".to_string()); args.insert(0, "integration".to_string());
cloud.exec(&docker, args, false, get_forward_env()).await?; cloud.exec(&docker, args, false, get_forward_env()).await?;
cloud.destroy(&docker).await?; cloud.destroy(&docker).await?;