Skip to content

Commit 0c4b42d

Browse files
authored
fix manifest + minor changes (#3397)
* minor change * populate env * add env for manifest * fmt
1 parent 3a72a61 commit 0c4b42d

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

tee-worker/omni-executor/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ENV BUILD_DIR=$HOME/tee-worker/omni-executor
6969
COPY . $HOME
7070
WORKDIR $BUILD_DIR
7171

72-
RUN make
72+
RUN make SGX=1 SGX_DEBUG=0
7373

7474

7575
### Release image (with SGX Hardware)
@@ -91,12 +91,12 @@ RUN apt-get install -y \
9191
curl \
9292
libssl-dev \
9393
clang \
94+
pkg-config \
9495
ca-certificates
9596

9697
RUN mkdir -p /wkdir /wkdir/local
9798

9899
COPY --from=sgx-builder $BUILD_DIR/omni-executor $BIN_DIR/omni-executor
99-
COPY --from=sgx-builder $BUILD_DIR/omni-executor.manifest $BIN_DIR/omni-executor.manifest
100100
COPY --from=sgx-builder $BUILD_DIR/omni-executor.manifest.sgx $BIN_DIR/omni-executor.manifest.sgx
101101
COPY --from=sgx-builder $BUILD_DIR/omni-executor.sig $BIN_DIR/omni-executor.sig
102102

@@ -108,7 +108,7 @@ RUN groupadd -g 1000 ubuntu && \
108108
RUN chmod +x $BIN_DIR/omni-executor && \
109109
chown ubuntu:ubuntu * && \
110110
ldd $BIN_DIR/omni-executor && $BIN_DIR/omni-executor --version && \
111-
ls -al $BIN_DIR
111+
ls -al $BIN_DIR
112112

113113
USER ubuntu
114114

tee-worker/omni-executor/omni-executor.manifest.template

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ sgx.trusted_files = [
3939
"file:/usr/lib/ssl/certs/ca-certificates.crt",
4040
]
4141

42+
sgx.allowed_files = [ "file:/usr/lib/ssl/certs" ]
43+
4244
# The maximum number of threads in a single process needs to be declared in advance.
4345
# You need to account for:
4446
# - one main thread

tee-worker/omni-executor/parentchain/attestation/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ pub async fn perform_attestation(
4545
f.write_all(&content).unwrap();
4646

4747
quote = fs::read("/dev/attestation/quote").unwrap();
48-
info!("Attestation quote {:?}", quote);
4948

5049
let dcap_quote: DcapQuote =
5150
DcapQuote::decode(&mut quote.as_slice()).expect("Failed to decode quote");
51+
info!("Attestation dcap_quote {:?}", dcap_quote);
5252

5353
mrenclave = dcap_quote.body.mr_enclave;
5454
info!("MRENCLAVE in hex {:?}", hex::encode(mrenclave));

0 commit comments

Comments
 (0)