From a389dc216cca57902975996755e7e528896c8768 Mon Sep 17 00:00:00 2001
From: volcano0dr <volcano_dr@163.com>
Date: Mon, 1 Aug 2022 19:48:16 +0800
Subject: [PATCH] Bump to 0.29.0

---
 src/exec/Cargo.lock                 | 2 +-
 src/libos/Cargo.lock                | 2 +-
 src/pal/include/occlum_version.h    | 6 +++---
 tools/docker/Dockerfile.ubuntu20.04 | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/exec/Cargo.lock b/src/exec/Cargo.lock
index ec465f0c..d2344c91 100644
--- a/src/exec/Cargo.lock
+++ b/src/exec/Cargo.lock
@@ -542,7 +542,7 @@ dependencies = [
 
 [[package]]
 name = "occlum_exec"
-version = "0.28.1"
+version = "0.29.0"
 dependencies = [
  "chrono",
  "clap",
diff --git a/src/libos/Cargo.lock b/src/libos/Cargo.lock
index 3c5f4391..271d0562 100644
--- a/src/libos/Cargo.lock
+++ b/src/libos/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "Occlum"
-version = "0.28.1"
+version = "0.29.0"
 dependencies = [
  "aligned",
  "atomic",
diff --git a/src/pal/include/occlum_version.h b/src/pal/include/occlum_version.h
index 6525e789..307c5a17 100644
--- a/src/pal/include/occlum_version.h
+++ b/src/pal/include/occlum_version.h
@@ -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)
diff --git a/tools/docker/Dockerfile.ubuntu20.04 b/tools/docker/Dockerfile.ubuntu20.04
index e1445263..b87ff476 100644
--- a/tools/docker/Dockerfile.ubuntu20.04
+++ b/tools/docker/Dockerfile.ubuntu20.04
@@ -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 && \