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

Commit 0532f69

Browse files
committed
BLD: upgraded baidu/apache to 0.1.1
1 parent 4a8ca35 commit 0532f69

File tree

24 files changed

+1106
-1080
lines changed

24 files changed

+1106
-1080
lines changed

.drone.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ steps:
66
detach: true
77

88
- name: core
9-
image: enigmampc/enigma-core:0.0.10
9+
image: enigmampc/enigma-core:0.0.11
1010
privileged: true
1111
depends_on: [clone]
1212
commands:
@@ -20,7 +20,7 @@ steps:
2020
path: /dev/isgx
2121

2222
- name: principal
23-
image: enigmampc/enigma-core:0.0.10
23+
image: enigmampc/enigma-core:0.0.11
2424
privileged: true
2525
depends_on: [clone]
2626
commands:
@@ -34,7 +34,7 @@ steps:
3434
path: /dev/isgx
3535

3636
- name: tools_u
37-
image: enigmampc/enigma-core:0.0.10
37+
image: enigmampc/enigma-core:0.0.11
3838
depends_on: [clone]
3939
commands:
4040
- . /root/.cargo/env
@@ -43,7 +43,7 @@ steps:
4343
- RUSTFLAGS=-Awarnings cargo test
4444

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

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

6565
- name: eng_wasm
66-
image: enigmampc/enigma-core:0.0.10
66+
image: enigmampc/enigma-core:0.0.11
6767
depends_on: [clone]
6868
commands:
6969
- . /root/.cargo/env
7070
- cd eng-wasm/derive
7171
- cargo test
7272

7373
- name: enigma_types
74-
image: enigmampc/enigma-core:0.0.10
74+
image: enigmampc/enigma-core:0.0.11
7575
depends_on: [clone]
7676
commands:
7777
- LD_LIBRARY_PATH=/opt/intel/libsgx-enclave-common/aesm /opt/intel/libsgx-enclave-common/aesm/aesm_service

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Step 3/7 : WORKDIR /root
4141
Step 4/7 : RUN rm -rf /root/sgx
4242
---> Using cache
4343
---> da313d0a4471
44-
Step 5/7 : RUN git clone https://github.com/baidu/rust-sgx-sdk.git sgx -b v1.0.0
44+
Step 5/7 : RUN git clone https://github.com/apache/teaclave-sgx-sdk.git sgx -b v1.0.0
4545
---> Using cache
4646
---> 704631bc2d68
4747
Step 6/7 : RUN apt-get install -y libzmq3-dev

dockerfile/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# inherit the baidu sdk image
2-
FROM baiduxlab/sgx-rust:1804-1.0.9
2+
FROM baiduxlab/sgx-rust:1804-1.1.0
33

44
LABEL maintainer=enigmampc
55

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

1919

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

2323

2424
RUN git clone --depth 1 --branch v5.18.3 https://github.com/facebook/rocksdb.git rocksdb && \

enigma-core/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ RustEnclave_Link_Libs := -L$(CUSTOM_LIBRARY_PATH) -lcompiler-rt-patch -lenclave
109109
RustEnclave_Compile_Flags := $(SGX_COMMON_CFLAGS) -nostdinc -fvisibility=hidden -fpie -fstack-protector $(RustEnclave_Include_Paths)
110110
RustEnclave_Link_Flags := $(SGX_COMMON_CFLAGS) -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles -L$(SGX_LIBRARY_PATH) \
111111
-Wl,--whole-archive -l$(Trts_Library_Name) -l$(Service_Library_Name) -Wl,--no-whole-archive \
112-
-Wl,--start-group -lsgx_tstdc -lsgx_tcxx -l$(Crypto_Library_Name) $(RustEnclave_Link_Libs) -Wl,--end-group \
112+
-Wl,--start-group -lsgx_tcxx -lsgx_tstdc -l$(Crypto_Library_Name) $(RustEnclave_Link_Libs) -Wl,--end-group \
113113
-Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \
114114
-Wl,-pie,-eenclave_entry -Wl,--export-dynamic \
115115
-Wl,--defsym,__ImageBase=0 \

0 commit comments

Comments
 (0)