wip: Making Injectable exec (#1897)

* wip: Making Injectable exec

* chore: Cleanup dup code.

* chore: Fixes for consistancy.

* Fix: BUild and the join handle in the join_main
This commit is contained in:
J M
2022-11-02 13:20:22 -06:00
committed by Aiden McClelland
parent 21cf4cd2ce
commit 55b1c021ec
4 changed files with 32 additions and 18 deletions

View File

@@ -230,6 +230,15 @@ impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> S9pkReader<R> {
&man.volumes,
&validated_image_ids,
)?;
if man.containers.is_some()
&& matches!(man.main, crate::procedure::PackageProcedure::Docker(_))
{
return Err(Error::new(
eyre!("Cannot have a main docker and a main in containers"),
crate::ErrorKind::ValidateS9pk,
));
}
if let Some(props) = &man.properties {
props
.validate(