Olaf Hering
1e644ab00b
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-nitro-enclaves-cli?expand=0&rev=4
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
--- a/enclave_build/src/docker.rs
|
|
+++ b/enclave_build/src/docker.rs
|
|
@@ -344,7 +344,13 @@ impl DockerUtil {
|
|
|
|
let act = async {
|
|
match self.docker.images().get(&self.docker_image).inspect().await {
|
|
- Ok(image) => Ok((image.config.cmd.unwrap(), image.config.env.unwrap())),
|
|
+ Ok(image) => {
|
|
+ let env: Vec<String> = vec![ "a=b".to_string() ];
|
|
+ info!("{:?}", image);
|
|
+ Ok((
|
|
+ image.config.cmd.unwrap(),
|
|
+ env,
|
|
+ ))},
|
|
Err(e) => {
|
|
error!("{:?}", e);
|
|
Err(DockerError::InspectError)
|
|
--- a/init.c
|
|
+++ b/init.c
|
|
@@ -386,6 +386,9 @@ void init_nsm_driver() {
|
|
die_on(rc < 0, "failed to insert nsm driver");
|
|
|
|
die_on(close(fd), "close nsm fd");
|
|
+ rc = unlink(NSM_PATH);
|
|
+ if (rc < 0)
|
|
+ warn("Could not unlink " NSM_PATH);
|
|
}
|
|
|
|
int main() {
|
|
@@ -418,6 +421,9 @@ int main() {
|
|
fclose(env_file);
|
|
fclose(cmd_file);
|
|
|
|
+ unlink("/env");
|
|
+ unlink("/cmd");
|
|
+
|
|
die_on(chdir("/rootfs") != 0, "chdir /rootfs");
|
|
die_on(chroot("/rootfs") != 0, "chroot /rootfs");
|
|
|