You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by rd...@apache.org on 2021/07/19 06:57:14 UTC
[incubator-teaclave-sgx-sdk] 02/05: docker: fix build script
This is an automated email from the ASF dual-hosted git repository.
rduan pushed a commit to branch v1.1.4-testing
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-sgx-sdk.git
commit 30a71c00543b1a72b66af256fdd189fc28c9dd2c
Author: Yu Ding <di...@gmail.com>
AuthorDate: Sun Mar 7 21:56:58 2021 -0800
docker: fix build script
---
dockerfile/03_sdk.sh | 2 +-
dockerfile/04_psw_deb.sh | 2 +-
dockerfile/build.sh | 10 +++++-----
dockerfile/push.sh | 10 +++++-----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dockerfile/03_sdk.sh b/dockerfile/03_sdk.sh
index f288476..0dcdb01 100644
--- a/dockerfile/03_sdk.sh
+++ b/dockerfile/03_sdk.sh
@@ -10,7 +10,7 @@ else
cd /root && \
git clone --recursive https://github.com/intel/linux-sgx && \
cd linux-sgx && \
- git checkout 608fe1df4c7c99433b0b8e9abdd31ba67c79ceb0 && \
+ git checkout sgx_2.13 && \
./download_prebuilt.sh && \
make -j "$(nproc)" sdk_install_pkg && \
echo -e 'no\n/opt' | ./linux/installer/bin/sgx_linux_x64_sdk_2.13.100.4.bin && \
diff --git a/dockerfile/04_psw_deb.sh b/dockerfile/04_psw_deb.sh
index 0b1dd39..9db9c53 100644
--- a/dockerfile/04_psw_deb.sh
+++ b/dockerfile/04_psw_deb.sh
@@ -2,7 +2,7 @@ source /opt/sgxsdk/environment && \
cd /root && \
git clone --recursive https://github.com/intel/linux-sgx && \
cd linux-sgx && \
-git checkout sgx_2.11 && \
+git checkout sgx_2.13 && \
./download_prebuilt.sh && \
make deb_local_repo && \
cd linux/installer/deb && \
diff --git a/dockerfile/build.sh b/dockerfile/build.sh
index e8629f0..4fee90d 100755
--- a/dockerfile/build.sh
+++ b/dockerfile/build.sh
@@ -8,11 +8,11 @@ DOCKERFILE_2004_NIGHTLY=Dockerfile.2004.nightly
DOCKERFILE_centos8_NIGHTLY=Dockerfile.centos8.nightly
DOCKERFILE_fedora31_NIGHTLY=Dockerfile.fedora31.nightly
-IMAGE_1604_NIGHTLY=baiduxlab/sgx-rust:1604-1.1.3
-IMAGE_1804_NIGHTLY=baiduxlab/sgx-rust:1804-1.1.3
-IMAGE_2004_NIGHTLY=baiduxlab/sgx-rust:2004-1.1.3
-IMAGE_centos8_NIGHTLY=baiduxlab/sgx-rust:centos8-1.1.3
-IMAGE_fedora31_NIGHTLY=baiduxlab/sgx-rust:fedora31-1.1.3
+IMAGE_1604_NIGHTLY=baiduxlab/sgx-rust:1604-1.1.4
+IMAGE_1804_NIGHTLY=baiduxlab/sgx-rust:1804-1.1.4
+IMAGE_2004_NIGHTLY=baiduxlab/sgx-rust:2004-1.1.4
+IMAGE_centos8_NIGHTLY=baiduxlab/sgx-rust:centos8-1.1.4
+IMAGE_fedora31_NIGHTLY=baiduxlab/sgx-rust:fedora31-1.1.4
build_one() {
docker build --no-cache -t $1 -f $2 .
diff --git a/dockerfile/push.sh b/dockerfile/push.sh
index d6a8b21..1e5b82e 100755
--- a/dockerfile/push.sh
+++ b/dockerfile/push.sh
@@ -8,11 +8,11 @@ DOCKERFILE_2004_NIGHTLY=Dockerfile.2004.nightly
DOCKERFILE_centos8_NIGHTLY=Dockerfile.centos8.nightly
DOCKERFILE_fedora31_NIGHTLY=Dockerfile.fedora31.nightly
-IMAGE_1604_NIGHTLY=baiduxlab/sgx-rust:1604-1.1.3
-IMAGE_1804_NIGHTLY=baiduxlab/sgx-rust:1804-1.1.3
-IMAGE_2004_NIGHTLY=baiduxlab/sgx-rust:2004-1.1.3
-IMAGE_centos8_NIGHTLY=baiduxlab/sgx-rust:centos8-1.1.3
-IMAGE_fedora31_NIGHTLY=baiduxlab/sgx-rust:fedora31-1.1.3
+IMAGE_1604_NIGHTLY=baiduxlab/sgx-rust:1604-1.1.4
+IMAGE_1804_NIGHTLY=baiduxlab/sgx-rust:1804-1.1.4
+IMAGE_2004_NIGHTLY=baiduxlab/sgx-rust:2004-1.1.4
+IMAGE_centos8_NIGHTLY=baiduxlab/sgx-rust:centos8-1.1.4
+IMAGE_fedora31_NIGHTLY=baiduxlab/sgx-rust:fedora31-1.1.4
push_one() {
docker push $1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org