general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump to 0.29.0

Browse Source
This commit is contained in:
volcano0dr 2022-08-01 19:48:16 +08:00 committed by Zongmin.Gu
parent 1258013523
commit a389dc216c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exec/Cargo.lock generated
View File

@ -542,7 +542,7 @@ dependencies = [
[[package]] [[package]]
name = "occlum_exec" name = "occlum_exec"
version = "0.28.1" version = "0.29.0"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap", "clap",

2
src/libos/Cargo.lock generated
View File

@ -4,7 +4,7 @@ version = 3
[[package]] [[package]]
name = "Occlum" name = "Occlum"
version = "0.28.1" version = "0.29.0"
dependencies = [ dependencies = [
"aligned", "aligned",
"atomic", "atomic",

6
src/pal/include/occlum_version.h
View File

@ -3,10 +3,10 @@
#ifndef _OCCLUM_VERSION_H_ #ifndef _OCCLUM_VERSION_H_
#define _OCCLUM_VERSION_H_ #define _OCCLUM_VERSION_H_
// Version = 0.28.1 // Version = 0.29.0
#define OCCLUM_MAJOR_VERSION 0 #define OCCLUM_MAJOR_VERSION 0
#define OCCLUM_MINOR_VERSION 28 #define OCCLUM_MINOR_VERSION 29
#define OCCLUM_PATCH_VERSION 1 #define OCCLUM_PATCH_VERSION 0
#define STRINGIZE_PRE(X) #X #define STRINGIZE_PRE(X) #X
#define STRINGIZE(X) STRINGIZE_PRE(X) #define STRINGIZE(X) STRINGIZE_PRE(X)

8
tools/docker/Dockerfile.ubuntu20.04
View File

@ -79,15 +79,15 @@ RUN echo "ca_directory=/etc/ssl/certs" >> /etc/wgetrc && \
# Install Rust # Install Rust
ENV PATH="/root/.cargo/bin:$PATH" 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 | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \ sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \
rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \ rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \
cargo -V cargo -V
# Install SGX PSW # Install SGX PSW
ARG PSW_VERSION=2.16.100.4 ARG PSW_VERSION=2.17.100.3
ARG DCAP_VERSION=1.13.100.4 ARG DCAP_VERSION=1.14.100.3
RUN apt-get update && aptitude install -y \ RUN apt-get update && aptitude install -y \
libsgx-launch-dev=$PSW_VERSION-focal1 \ libsgx-launch-dev=$PSW_VERSION-focal1 \
libsgx-epid-dev=$PSW_VERSION-focal1 \ libsgx-epid-dev=$PSW_VERSION-focal1 \
@ -125,7 +125,7 @@ RUN apt-get update && aptitude install -y \
# Install SGX SDK # Install SGX SDK
WORKDIR /tmp 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 && \ mkdir /etc/init && \
cd linux-sgx && \ cd linux-sgx && \
make preparation && \ make preparation && \