Null fields in docker config cause build-enclave to fail

I use dockerTools.buildLayeredImage to build docker images. It sets Env, Entrypoint, and Cmd to null if not set, this causes nitro-cli build-enclave to fail:

If either Entrypoint or Cmd is null then it fails with UnsupportedEntryPoint
If both Entrypoint and Cmd are not null and Env is null then it panics here:

aws-nitro-enclaves-cli/enclave_build/src/docker.rs

Line 331 in bc9c0b8

image.config.env.ok_or_else(Vec::<String>::new).unwrap(),

I think the panic is because of a logic bug:

aws-nitro-enclaves-cli/enclave_build/src/docker.rs

Lines 328 to 337 in bc9c0b8

    
           match self.docker.images().get(&self.docker_image).inspect().await { 
        
               Ok(image) => Ok(( 
        
                   image.config.entrypoint.unwrap(), 
        
                   image.config.env.ok_or_else(Vec::<String>::new).unwrap(), 
        
               )), 
        
               Err(e) => { 
        
                   error!("{:?}", e); 
        
                   Err(DockerError::InspectError) 
        
               } 
        
           }

Should instead be:

match self.docker.images().get(&self.docker_image).inspect().await {
    Ok(image) => Ok((
        image.config.entrypoint.unwrap(),
        image.config.env.unwrap_or_else(Vec::<String>::new), // <-- here
    )),
    Err(e) => {
        error!("{:?}", e);
        Err(DockerError::InspectError)
    }
}

I don't know how docker handles it, but my assumption is:

If Entrypoint is null, then use Cmd
If Cmd is null, then use Entrypoint

I have tested the images directly with docker and they work as expected.

I am having other issues with images created by dockerTools which can be attributed to shiplift (the docker library used). Shiplift hasn't been updated in 3 years and assumes things that are no longer true, I suggest migrating away from it in favor of bollard which is more up to date.

Specifically shiplift expects the virtual_size field to be present, but it is not guaranteed to be:

virtual_size:
Total size of the image including all layers it is composed of. Deprecated: this field is omitted in API v1.44, but kept for backward compatibility. Use Size instead

For anyone coming across this issue, you can temporarily fix it by rolling back docker (sudo dnf downgrade docker) to version 24 which still sends the deprecated field.

Thank you! Downgrading to Docker 24.0.5 fixed my issue

#595 will fix the issue.

#595 has been merged!

	match self.docker.images().get(&self.docker_image).inspect().await {
	Ok(image) => Ok((
	image.config.entrypoint.unwrap(),
	image.config.env.ok_or_else(Vec::<String>::new).unwrap(),
	)),
	Err(e) => {
	error!("{:?}", e);
	Err(DockerError::InspectError)
	}
	}