Skip to content

Commit

Permalink
Review changes
Browse files Browse the repository at this point in the history
  • Loading branch information
aditijannu committed Mar 15, 2024
1 parent c4141a0 commit 1fab3c2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,17 @@ This guide allows you to build salmiac from source and convert your docker appli
- Install Rust:
Follow [this](https://www.rust-lang.org/tools/install) guide.
- Install Docker:
Follow [this](https://docs.docker.com/engine/install/) guide.
Follow [this](https://docs.docker.com/engine/install/) guide to install version 24.0.x
OR
```bash
apt-get install docker-ce=5:24.0.1-1~ubuntu.20.04~focal docker-ce-cli=5:24.0.1-1~ubuntu.20.04~focal containerd.io
```
- Install tools needed to build the linux kernel:
Follow [this](https://kernelnewbies.org/KernelBuild) guide.
- Install additional dependencies:
```bash
apt-get install pkg-config libclang-dev cmake libpcap-dev
```

2. Set up your Nitro-enabled AWS EC2 instance:
- Install docker on your EC2:
Expand Down
4 changes: 2 additions & 2 deletions docker/amzn-linux-nbd/build-enclave-kernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ buildkernel() {
# Build the enclave kernel
make prepare
make modules_prepare
make modules
make
make modules -j
make -j
make bzImage

# Once build is complete, we would need a copy of the bzImage file
Expand Down
5 changes: 5 additions & 0 deletions docker/build-conv-container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,10 @@ mv ./staging/container-converter ./staging/server
docker save -o ./staging/nitro-enclave-base.tar enclave-base
docker save -o ./staging/nitro-parent-base.tar parent-base

# The Dockerfile used to build the converter uses a prebuilt parent-base
# image by default which resides in the Fortanix ECR repository. The users
# of this script can use the parent-base image which was built by them.
docker tag parent-base 513076507034.dkr.ecr.us-west-1.amazonaws.com/nitro-parent-base:1.1.3

# Build the converter
docker build -t converter .

0 comments on commit 1fab3c2

Please sign in to comment.