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

Fix bugs that fail CentOS Dockerfile

Browse Source
This commit is contained in:
He Sun 2020-02-13 16:26:52 +08:00 committed by Tate, Hongliang Tian
parent 2372ef0d4e
commit cfa6532768
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sgxenv.mk
View File

@ -22,7 +22,7 @@ else ifeq ($(findstring -m32, $(CXXFLAGS)), -m32)
SGX_ARCH := x86 SGX_ARCH := x86
endif endif
SGX_COMMON_CFLAGS := -Wall SGX_COMMON_CFLAGS := -Wall -std=gnu11
ifeq ($(SGX_ARCH), x86) ifeq ($(SGX_ARCH), x86)
SGX_COMMON_CFLAGS += -m32 SGX_COMMON_CFLAGS += -m32

5
tools/docker/Dockerfile.centos7.2
View File

@ -60,11 +60,12 @@ RUN git clone -b sgx_2.7.1_for_occlum https://github.com/occlum/linux-sgx && \
rm -rf /tmp/linux-sgx rm -rf /tmp/linux-sgx
# Install Rust # Install Rust
ENV PATH="/root/.cargo/bin:$PATH"
ENV OCCLUM_RUST_VERSION=nightly-2019-11-25 ENV OCCLUM_RUST_VERSION=nightly-2019-11-25
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 && \
ENV PATH="/root/.cargo/bin:$PATH" cargo -V
# Upgrade gcc to compile occlum toolchain. # Upgrade gcc to compile occlum toolchain.
# Use Developer Toolset 8 from Software Collections (SCLs) to have a newer gcc (8.3.1) than # Use Developer Toolset 8 from Software Collections (SCLs) to have a newer gcc (8.3.1) than

5
tools/docker/Dockerfile.ubuntu16.04
View File

@ -60,11 +60,12 @@ RUN git clone -b sgx_2.7.1_for_occlum https://github.com/occlum/linux-sgx && \
rm -rf /tmp/linux-sgx rm -rf /tmp/linux-sgx
# Install Rust # Install Rust
ENV PATH="/root/.cargo/bin:$PATH"
ENV OCCLUM_RUST_VERSION=nightly-2019-11-25 ENV OCCLUM_RUST_VERSION=nightly-2019-11-25
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 && \
ENV PATH="/root/.cargo/bin:$PATH" cargo -V
# Install Occlum toolchain # Install Occlum toolchain
COPY toolchains/gcc/* /tmp/ COPY toolchains/gcc/* /tmp/

5
tools/docker/Dockerfile.ubuntu18.04
View File

@ -62,11 +62,12 @@ RUN git clone -b sgx_2.7.1_for_occlum https://github.com/occlum/linux-sgx && \
rm -rf /tmp/linux-sgx rm -rf /tmp/linux-sgx
# Install Rust # Install Rust
ENV PATH="/root/.cargo/bin:$PATH"
ENV OCCLUM_RUST_VERSION=nightly-2019-11-25 ENV OCCLUM_RUST_VERSION=nightly-2019-11-25
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 && \
ENV PATH="/root/.cargo/bin:$PATH" cargo -V
# Install Occlum toolchain # Install Occlum toolchain
COPY toolchains/gcc/* /tmp/ COPY toolchains/gcc/* /tmp/