Skip to content
This repository was archived by the owner on Jun 21, 2020. It is now read-only.

Upgraded baidu/apache to 0.1.1 #282

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ steps:
detach: true

- name: core
image: enigmampc/enigma-core:0.0.10
image: enigmampc/enigma-core:0.0.11
privileged: true
depends_on: [clone]
commands:
Expand All @@ -20,7 +20,7 @@ steps:
path: /dev/isgx

- name: principal
image: enigmampc/enigma-core:0.0.10
image: enigmampc/enigma-core:0.0.11
privileged: true
depends_on: [clone]
commands:
Expand All @@ -34,7 +34,7 @@ steps:
path: /dev/isgx

- name: tools_u
image: enigmampc/enigma-core:0.0.10
image: enigmampc/enigma-core:0.0.11
depends_on: [clone]
commands:
- . /root/.cargo/env
Expand All @@ -43,7 +43,7 @@ steps:
- RUSTFLAGS=-Awarnings cargo test

- name: enigma_crypto
image: enigmampc/enigma-core:0.0.10
image: enigmampc/enigma-core:0.0.11
depends_on: [clone]
commands:
- LD_LIBRARY_PATH=/opt/intel/libsgx-enclave-common/aesm /opt/intel/libsgx-enclave-common/aesm/aesm_service
Expand All @@ -53,7 +53,7 @@ steps:
- RUSTFLAGS=-Awarnings cargo build --no-default-features --features=sgx

- name: tools_m
image: enigmampc/enigma-core:0.0.10
image: enigmampc/enigma-core:0.0.11
depends_on: [clone]
commands:
- LD_LIBRARY_PATH=/opt/intel/libsgx-enclave-common/aesm /opt/intel/libsgx-enclave-common/aesm/aesm_service
Expand All @@ -63,15 +63,15 @@ steps:
- RUSTFLAGS=-Awarnings cargo check --no-default-features --features=sgx

- name: eng_wasm
image: enigmampc/enigma-core:0.0.10
image: enigmampc/enigma-core:0.0.11
depends_on: [clone]
commands:
- . /root/.cargo/env
- cd eng-wasm/derive
- cargo test

- name: enigma_types
image: enigmampc/enigma-core:0.0.10
image: enigmampc/enigma-core:0.0.11
depends_on: [clone]
commands:
- LD_LIBRARY_PATH=/opt/intel/libsgx-enclave-common/aesm /opt/intel/libsgx-enclave-common/aesm/aesm_service
Expand Down Expand Up @@ -204,6 +204,7 @@ steps:
- docker-compose -f docker-compose.yml -f docker-compose.hw.yml down -v --rmi all --remove-orphans
- docker rmi -f enigmampc/core-artifact-hw:$DOCKER_TAG

type: docker
volumes:
- name: isgx
host:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Step 3/7 : WORKDIR /root
Step 4/7 : RUN rm -rf /root/sgx
---> Using cache
---> da313d0a4471
Step 5/7 : RUN git clone https://github.com/baidu/rust-sgx-sdk.git sgx -b v1.0.0
Step 5/7 : RUN git clone https://github.com/apache/teaclave-sgx-sdk.git sgx -b v1.0.0
---> Using cache
---> 704631bc2d68
Step 6/7 : RUN apt-get install -y libzmq3-dev
Expand Down
4 changes: 2 additions & 2 deletions dockerfile/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# inherit the baidu sdk image
FROM baiduxlab/sgx-rust:1804-1.0.9
FROM baiduxlab/sgx-rust:1804-1.1.0

LABEL maintainer=enigmampc

Expand All @@ -18,7 +18,7 @@ RUN /root/.cargo/bin/rustup target add wasm32-unknown-unknown && \


# clone the rust-sgx-sdk baidu sdk
RUN git clone --depth 1 -b v1.0.9 https://github.com/baidu/rust-sgx-sdk.git sgx
RUN git clone --depth 1 -b v1.1.0 https://github.com/apache/teaclave-sgx-sdk.git sgx


RUN git clone --depth 1 --branch v5.18.3 https://github.com/facebook/rocksdb.git rocksdb && \
Expand Down
2 changes: 1 addition & 1 deletion enigma-core/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ RustEnclave_Link_Libs := -L$(CUSTOM_LIBRARY_PATH) -lcompiler-rt-patch -lenclave
RustEnclave_Compile_Flags := $(SGX_COMMON_CFLAGS) -nostdinc -fvisibility=hidden -fpie -fstack-protector $(RustEnclave_Include_Paths)
RustEnclave_Link_Flags := $(SGX_COMMON_CFLAGS) -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles -L$(SGX_LIBRARY_PATH) \
-Wl,--whole-archive -l$(Trts_Library_Name) -l$(Service_Library_Name) -Wl,--no-whole-archive \
-Wl,--start-group -lsgx_tstdc -lsgx_tcxx -l$(Crypto_Library_Name) $(RustEnclave_Link_Libs) -Wl,--end-group \
-Wl,--start-group -lsgx_tcxx -lsgx_tstdc -l$(Crypto_Library_Name) $(RustEnclave_Link_Libs) -Wl,--end-group \
-Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \
-Wl,-pie,-eenclave_entry -Wl,--export-dynamic \
-Wl,--defsym,__ImageBase=0 \
Expand Down
Loading