From 8941c697fbb3af10042dad018bd1f4ba5f5ee668 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 27 Feb 2026 17:07:37 +0100 Subject: [PATCH] fix `integration` not using all passed options --- nix/image/bootstrap.sh | 1 + src/main.rs | 22 ++-------------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/nix/image/bootstrap.sh b/nix/image/bootstrap.sh index 5705b2c..5f85777 100755 --- a/nix/image/bootstrap.sh +++ b/nix/image/bootstrap.sh @@ -4,6 +4,7 @@ touch /var/log/nginx/access.log touch /var/log/nginx/error.log touch /var/log/cron/owncloud.log +mkdir -p /config echo "# Options in here overwrite the builtin php.ini" > /config/php.ini echo "# xdebug.mode = debug" >> /config/php.ini echo "# xdebug.start_with_request = yes" >> /config/php.ini diff --git a/src/main.rs b/src/main.rs index 091afd0..485867c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -269,26 +269,8 @@ async fn main() -> Result { return Ok(result.into()); } HazeArgs::Integration { options, mut args } => { - let cloud = Cloud::create(&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::::default(), - ) - .await - { - cloud.destroy(&docker).await?; - return Err(e); - } + let cloud = setup(&docker, options, &config).await?; + args.insert(0, "integration".to_string()); cloud.exec(&docker, args, false, get_forward_env()).await?; cloud.destroy(&docker).await?;