Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix DCAP build in docker #1306

Merged
merged 5 commits into from
May 18, 2023
Merged

Fix DCAP build in docker #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3565808
docker: add WORKER_FEATURES_ARG needed for DCAP
OverOrion May 17, 2023
0afd94b
docker: fix LD_LIBRARY_PATH from aesmd service
OverOrion May 17, 2023
a2d31c8
service/main: follow-up for send_extrinsic signature changes in DCAP …
OverOrion May 17, 2023
2bfdf78
fixup! docker: fix LD_LIBRARY_PATH from aesmd service
OverOrion May 17, 2023
c50633d
Merge branch 'master' into szp/dcap-docker-build-fixes
OverOrion May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion build.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ ENV CARGO_NET_GIT_FETCH_WITH_CLI true
ARG SGX_MODE=SW
ENV SGX_MODE=$SGX_MODE

ARG WORKER_FEATURES_ARG
ENV WORKER_FEATURES=$WORKER_FEATURES_ARG

ENV WORKHOME=/home/ubuntu/work
ENV HOME=/home/ubuntu

Expand All @@ -57,14 +60,16 @@ WORKDIR $WORKHOME/worker
COPY . .

RUN --mount=type=cache,id=cargo-registry,target=/opt/rust/registry \
--mount=type=cache,id=cargo-git,target=/opt/rust/git/db \
--mount=type=cache,id=cargo-git,target=/opt/rust/git/db \
--mount=type=cache,id=cargo-sccache-${WORKER_MODE}${ADDITIONAL_FEATURES},target=/home/ubuntu/.cache/sccache \
echo ${FINGERPRINT} && make && cargo test --release && sccache --show-stats

### Base Runner Stage
### The runner needs the aesmd service for the `SGX_MODE=HW`.
######################################################
FROM oasisprotocol/aesmd:master AS runner
ENV SGX_SDK /opt/sgxsdk
ENV LD_LIBRARY_PATH "${SGX_SDK}/sdk_libs"

### Deployed CLI client
##################################################
Expand Down
4 changes: 2 additions & 2 deletions service/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,10 +765,10 @@ fn register_collateral(
let (fmspc, _tcb_info) = extract_tcb_info_from_raw_dcap_quote(&dcap_quote).unwrap();

let uxt = enclave.generate_register_quoting_enclave_extrinsic(fmspc).unwrap();
send_extrinsic(&uxt, api, accountid, is_development_mode);
send_extrinsic(uxt, api, accountid, is_development_mode);

let uxt = enclave.generate_register_tcb_info_extrinsic(fmspc).unwrap();
send_extrinsic(&uxt, api, accountid, is_development_mode);
send_extrinsic(uxt, api, accountid, is_development_mode);
}
}

Expand Down