From ea67f50fc2baafa97ae70e8451b9cd42068e04d6 Mon Sep 17 00:00:00 2001
From: "Zheng, Qi" <huaiqing.zq@antgroup.com>
Date: Thu, 23 Sep 2021 19:16:46 +0800
Subject: [PATCH] Add building bash into occlum docker image

Signed-off-by: Zheng, Qi <huaiqing.zq@antgroup.com>
---
 tools/docker/Dockerfile.aliyunlinux3 | 4 ++++
 tools/docker/Dockerfile.centos8.2    | 4 ++++
 tools/docker/Dockerfile.ubuntu18.04  | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/tools/docker/Dockerfile.aliyunlinux3 b/tools/docker/Dockerfile.aliyunlinux3
index d7007ce7..8464156b 100644
--- a/tools/docker/Dockerfile.aliyunlinux3
+++ b/tools/docker/Dockerfile.aliyunlinux3
@@ -155,6 +155,10 @@ WORKDIR /tmp
 RUN cd rust && ./build.sh && rm -rf /tmp/rust
 ENV PATH="/opt/occlum/toolchains/rust/bin:$PATH"
 
+# Install Occlum bash
+WORKDIR /tmp
+RUN cd bash && ./build.sh && rm -rf /tmp/bash
+
 # Install Occlum Java toolchain (JDK 11)
 ARG JDK11_PATH=/opt/occlum/toolchains/jvm/java-11-openjdk
 COPY --from=alpine /usr/lib/jvm/java-11-openjdk $JDK11_PATH
diff --git a/tools/docker/Dockerfile.centos8.2 b/tools/docker/Dockerfile.centos8.2
index 21da8cbd..02b0c712 100644
--- a/tools/docker/Dockerfile.centos8.2
+++ b/tools/docker/Dockerfile.centos8.2
@@ -138,6 +138,10 @@ RUN cd rust && ./build.sh && rm -rf /tmp/rust
 ENV PATH="/opt/occlum/toolchains/rust/bin:$PATH"
 ENV LD_LIBRARY_PATH="/opt/intel/sgxsdk/sdk_libs"
 
+# Install Occlum bash
+WORKDIR /tmp
+RUN cd bash && ./build.sh && rm -rf /tmp/bash
+
 # Install Occlum Java toolchain (JDK 11)
 ARG JDK11_PATH=/opt/occlum/toolchains/jvm/java-11-openjdk
 COPY --from=alpine /usr/lib/jvm/java-11-openjdk $JDK11_PATH
diff --git a/tools/docker/Dockerfile.ubuntu18.04 b/tools/docker/Dockerfile.ubuntu18.04
index 5b993fd6..d895e2c1 100644
--- a/tools/docker/Dockerfile.ubuntu18.04
+++ b/tools/docker/Dockerfile.ubuntu18.04
@@ -155,6 +155,10 @@ RUN cd rust && ./build.sh && rm -rf /tmp/rust
 ENV PATH="/opt/occlum/toolchains/rust/bin:$PATH"
 ENV LD_LIBRARY_PATH="/opt/intel/sgxsdk/sdk_libs"
 
+# Install Occlum bash
+WORKDIR /tmp
+RUN cd bash && ./build.sh && rm -rf /tmp/bash
+
 # Install Occlum Java toolchain (JDK 11)
 ARG JDK11_PATH=/opt/occlum/toolchains/jvm/java-11-openjdk
 COPY --from=alpine /usr/lib/jvm/java-11-openjdk $JDK11_PATH