[incubator-teaclave-sgx-sdk] branch v1.1.1-testing updated: Fix centos7 full

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dingyu pushed a commit to branch v1.1.1-testing
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-sgx-sdk.git


The following commit(s) were added to refs/heads/v1.1.1-testing by this push:
     new 58c9dda  Fix centos7 full
58c9dda is described below

commit 58c9ddab1c872ff53d356434a28bda3ab3ece5e4
Author: Yu Ding <di...@gmail.com>
AuthorDate: Mon Mar 23 17:38:54 2020 -0700

    Fix centos7 full
---
 ...ull.1604.nightly => Dockerfile.1604.full.nightly} |  0
 dockerfile/Dockerfile.centos7.full.nightly           | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dockerfile/Dockerfile.full.1604.nightly b/dockerfile/Dockerfile.1604.full.nightly
similarity index 100%
rename from dockerfile/Dockerfile.full.1604.nightly
rename to dockerfile/Dockerfile.1604.full.nightly
diff --git a/dockerfile/Dockerfile.centos7.full.nightly b/dockerfile/Dockerfile.centos7.full.nightly
index c5528e6..721e470 100644
--- a/dockerfile/Dockerfile.centos7.full.nightly
+++ b/dockerfile/Dockerfile.centos7.full.nightly
@@ -1,19 +1,19 @@
 FROM centos:7
 
-#RUN yum-builddep gcc binutils -y && \
-#    yum install -y bzip2 ocaml ocaml-ocamlbuild wget python2 openssl-devel git protobuf-devel cmake && \
-#    yum groupinstall -y "Development Tools"
+RUN yum-builddep gcc binutils -y && \
+    yum install -y bzip2 ocaml ocaml-ocamlbuild wget python2 openssl-devel git protobuf-devel cmake && \
+    yum groupinstall -y "Development Tools"
 
-#ADD 01_gcc_8.sh /root
-#RUN bash /root/01_gcc_8.sh
+ADD 01_gcc_8.sh /root
+RUN bash /root/01_gcc_8.sh
 
-RUN yum install -y centos-release-scl && \
-    yum install devtoolset-8
+ENV BINUTILS_PREFIX=/opt/binutils
+ENV LD_LIBRARY_PATH=/usr/lib
 
 ADD 02_binutils.sh /root
-RUN bash /root/02_binutils.sh
-
-ENV LD_LIBRARY_PATH=/usr/lib
+RUN bash /root/02_binutils.sh && \
+    cp -r /opt/binutils/bin/* /usr/bin/ && \
+    cp -r /opt/binutils/lib/* /usr/lib/
 
 ADD 03_sdk.sh /root
 RUN bash /root/03_sdk.sh


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org