Bump to 0.29.0
This commit is contained in:
parent
1258013523
commit
a389dc216c
2
src/exec/Cargo.lock
generated
2
src/exec/Cargo.lock
generated
@ -542,7 +542,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "occlum_exec"
|
||||
version = "0.28.1"
|
||||
version = "0.29.0"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"clap",
|
||||
|
2
src/libos/Cargo.lock
generated
2
src/libos/Cargo.lock
generated
@ -4,7 +4,7 @@ version = 3
|
||||
|
||||
[[package]]
|
||||
name = "Occlum"
|
||||
version = "0.28.1"
|
||||
version = "0.29.0"
|
||||
dependencies = [
|
||||
"aligned",
|
||||
"atomic",
|
||||
|
@ -3,10 +3,10 @@
|
||||
#ifndef _OCCLUM_VERSION_H_
|
||||
#define _OCCLUM_VERSION_H_
|
||||
|
||||
// Version = 0.28.1
|
||||
// Version = 0.29.0
|
||||
#define OCCLUM_MAJOR_VERSION 0
|
||||
#define OCCLUM_MINOR_VERSION 28
|
||||
#define OCCLUM_PATCH_VERSION 1
|
||||
#define OCCLUM_MINOR_VERSION 29
|
||||
#define OCCLUM_PATCH_VERSION 0
|
||||
|
||||
#define STRINGIZE_PRE(X) #X
|
||||
#define STRINGIZE(X) STRINGIZE_PRE(X)
|
||||
|
@ -79,15 +79,15 @@ RUN echo "ca_directory=/etc/ssl/certs" >> /etc/wgetrc && \
|
||||
|
||||
# Install Rust
|
||||
ENV PATH="/root/.cargo/bin:$PATH"
|
||||
ENV OCCLUM_RUST_VERSION=nightly-2021-11-01
|
||||
ENV OCCLUM_RUST_VERSION=nightly-2022-02-23
|
||||
RUN curl https://sh.rustup.rs -sSf | \
|
||||
sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \
|
||||
rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \
|
||||
cargo -V
|
||||
|
||||
# Install SGX PSW
|
||||
ARG PSW_VERSION=2.16.100.4
|
||||
ARG DCAP_VERSION=1.13.100.4
|
||||
ARG PSW_VERSION=2.17.100.3
|
||||
ARG DCAP_VERSION=1.14.100.3
|
||||
RUN apt-get update && aptitude install -y \
|
||||
libsgx-launch-dev=$PSW_VERSION-focal1 \
|
||||
libsgx-epid-dev=$PSW_VERSION-focal1 \
|
||||
@ -125,7 +125,7 @@ RUN apt-get update && aptitude install -y \
|
||||
|
||||
# Install SGX SDK
|
||||
WORKDIR /tmp
|
||||
RUN git clone -b sgx_2.16_for_occlum https://github.com/occlum/linux-sgx && \
|
||||
RUN git clone -b sgx_2.17.1_for_occlum https://github.com/occlum/linux-sgx && \
|
||||
mkdir /etc/init && \
|
||||
cd linux-sgx && \
|
||||
make preparation && \
|
||||
|
Loading…
Reference in New Issue
Block a user