You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by hs...@apache.org on 2023/05/09 02:19:40 UTC
[incubator-teaclave] 03/05: [Dockerfile] Add compiler for webassembly and grpc python dependencies
This is an automated email from the ASF dual-hosted git repository.
hsun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit b0729bd21a91d6d4cdc2179c9d66204d10f75592
Author: sunhe05 <su...@baidu.com>
AuthorDate: Mon Apr 24 11:27:23 2023 +0000
[Dockerfile] Add compiler for webassembly and grpc python dependencies
---
.github/workflows/ci.yml | 4 ++--
.github/workflows/docker.yml | 2 +-
.github/workflows/ubuntu1804-test.yml | 2 +-
.github/workflows/ubuntu2004-test.yml | 14 +++++++-------
docker/build.ubuntu-1804-sgx-2.17.1.Dockerfile | 7 ++++++-
docker/build.ubuntu-1804-sgx-dcap-1.14.Dockerfile | 7 ++++++-
docker/build.ubuntu-2004-sgx-2.17.1.Dockerfile | 7 ++++++-
docker/build.ubuntu-2004-sgx-dcap-1.14.Dockerfile | 7 ++++++-
8 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c8c57513..31e52f89 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ defaults:
jobs:
format:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.1.0
+ container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.2.0
steps:
- uses: actions/checkout@v3
- name: Setting up $HOME
@@ -42,7 +42,7 @@ jobs:
make check
lint:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.1.0
+ container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.2.0
steps:
- uses: actions/checkout@v3
- name: Setting up $HOME
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 99141edf..5b99b91a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -23,7 +23,7 @@ on:
image_repo:
description: 'image repository'
required: true
- default: ${{ github.repository_owner }}
+ default: teaclave
jobs:
ubuntu-2004-sgx:
diff --git a/.github/workflows/ubuntu1804-test.yml b/.github/workflows/ubuntu1804-test.yml
index a126f3ab..3a20ca10 100644
--- a/.github/workflows/ubuntu1804-test.yml
+++ b/.github/workflows/ubuntu1804-test.yml
@@ -28,7 +28,7 @@ defaults:
jobs:
sim-debug-all:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-build-ubuntu-1804-sgx-2.17.1:0.1.0
+ container: teaclave/teaclave-build-ubuntu-1804-sgx-2.17.1:0.2.0
steps:
- uses: actions/checkout@v3
- name: Build
diff --git a/.github/workflows/ubuntu2004-test.yml b/.github/workflows/ubuntu2004-test.yml
index 9dd2f131..54f328bc 100644
--- a/.github/workflows/ubuntu2004-test.yml
+++ b/.github/workflows/ubuntu2004-test.yml
@@ -24,7 +24,7 @@ defaults:
jobs:
sim-debug-unit:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.1.0
+ container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.2.0
steps:
- uses: actions/checkout@v3
- name: Build
@@ -41,7 +41,7 @@ jobs:
make run-unit-tests
sim-debug-integration:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.1.0
+ container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.2.0
steps:
- uses: actions/checkout@v3
- name: Build
@@ -58,7 +58,7 @@ jobs:
make run-integration-tests
sim-debug-functional:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.1.0
+ container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.2.0
steps:
- uses: actions/checkout@v3
- name: Build
@@ -75,7 +75,7 @@ jobs:
make run-functional-tests
sim-debug-sdk:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.1.0
+ container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.2.0
steps:
- uses: actions/checkout@v3
- name: Build
@@ -92,7 +92,7 @@ jobs:
make run-sdk-tests
sim-debug-example:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.1.0
+ container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.2.0
steps:
- uses: actions/checkout@v3
- name: Build
@@ -109,7 +109,7 @@ jobs:
make run-examples
sim-debug-cancel:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.1.0
+ container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.2.0
steps:
- uses: actions/checkout@v3
- name: Build
@@ -126,7 +126,7 @@ jobs:
make run-cancel-test
sim-debug-libos-example:
runs-on: ubuntu-20.04
- container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.1.0
+ container: teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.2.0
steps:
- uses: actions/checkout@v3
- name: Build
diff --git a/docker/build.ubuntu-1804-sgx-2.17.1.Dockerfile b/docker/build.ubuntu-1804-sgx-2.17.1.Dockerfile
index e35c907f..476025ab 100644
--- a/docker/build.ubuntu-1804-sgx-2.17.1.Dockerfile
+++ b/docker/build.ubuntu-1804-sgx-2.17.1.Dockerfile
@@ -101,7 +101,7 @@ RUN apt-get update && apt-get install -q -y \
libjpeg-dev \
zlib1g-dev
-RUN pip3 install pyopenssl==21.0.0 toml cryptography yapf requests Pillow tomli
+RUN pip3 install pyopenssl==21.0.0 toml cryptography yapf requests Pillow tomli grpcio grpcio-tools grpclib
# install TVM dependencies
RUN apt-get install -q -y \
@@ -137,6 +137,11 @@ RUN wget https://apt.llvm.org/llvm.sh && \
update-alternatives --install /usr/bin/llvm-cov llvm-cov-11 /usr/bin/llvm-cov-11 11 && \
rm ./llvm.sh
+# To generate webassmebly
+RUN wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sdk-20.0-linux.tar.gz && \
+ tar -xf wasi-sdk-20.0-linux.tar.gz && \
+ rm wasi-sdk-20.0-linux.tar.gz
+
# clean up apt caches
RUN apt-get clean && \
diff --git a/docker/build.ubuntu-1804-sgx-dcap-1.14.Dockerfile b/docker/build.ubuntu-1804-sgx-dcap-1.14.Dockerfile
index 7c69e101..4dfac31a 100644
--- a/docker/build.ubuntu-1804-sgx-dcap-1.14.Dockerfile
+++ b/docker/build.ubuntu-1804-sgx-dcap-1.14.Dockerfile
@@ -109,7 +109,7 @@ RUN apt-get update && apt-get install -q -y \
libjpeg-dev \
zlib1g-dev
-RUN pip3 install pyopenssl==21.0.0 toml cryptography yapf requests Pillow tomli
+RUN pip3 install pyopenssl==21.0.0 toml cryptography yapf requests Pillow tomli grpcio grpcio-tools grpclib
# install TVM dependencies
RUN apt-get install -q -y \
@@ -145,6 +145,11 @@ RUN wget https://apt.llvm.org/llvm.sh && \
update-alternatives --install /usr/bin/llvm-cov llvm-cov-11 /usr/bin/llvm-cov-11 11 && \
rm ./llvm.sh
+# To generate webassmebly
+RUN wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sdk-20.0-linux.tar.gz && \
+ tar -xf wasi-sdk-20.0-linux.tar.gz && \
+ rm wasi-sdk-20.0-linux.tar.gz
+
# clean up apt caches
RUN apt-get clean && \
diff --git a/docker/build.ubuntu-2004-sgx-2.17.1.Dockerfile b/docker/build.ubuntu-2004-sgx-2.17.1.Dockerfile
index bb9fc906..4cfb7a1d 100644
--- a/docker/build.ubuntu-2004-sgx-2.17.1.Dockerfile
+++ b/docker/build.ubuntu-2004-sgx-2.17.1.Dockerfile
@@ -101,7 +101,7 @@ RUN apt-get update && apt-get install -q -y \
libjpeg-dev \
zlib1g-dev
-RUN pip3 install pyopenssl toml cryptography yapf requests Pillow
+RUN pip3 install pyopenssl toml cryptography yapf requests Pillow grpcio grpcio-tools grpclib
# install TVM dependencies
RUN apt-get install -q -y \
@@ -137,6 +137,11 @@ RUN wget https://apt.llvm.org/llvm.sh && \
update-alternatives --install /usr/bin/llvm-cov llvm-cov-11 /usr/bin/llvm-cov-11 11 && \
rm ./llvm.sh
+# To generate webassmebly
+RUN wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sdk-20.0-linux.tar.gz && \
+ tar -xf wasi-sdk-20.0-linux.tar.gz && \
+ rm wasi-sdk-20.0-linux.tar.gz
+
# clean up apt caches
RUN apt-get clean && \
diff --git a/docker/build.ubuntu-2004-sgx-dcap-1.14.Dockerfile b/docker/build.ubuntu-2004-sgx-dcap-1.14.Dockerfile
index 4628dcd2..941b906d 100644
--- a/docker/build.ubuntu-2004-sgx-dcap-1.14.Dockerfile
+++ b/docker/build.ubuntu-2004-sgx-dcap-1.14.Dockerfile
@@ -109,7 +109,7 @@ RUN apt-get update && apt-get install -q -y \
libjpeg-dev \
zlib1g-dev
-RUN pip3 install pyopenssl toml cryptography yapf requests Pillow
+RUN pip3 install pyopenssl toml cryptography yapf requests Pillow grpcio grpcio-tools grpclib
# install TVM dependencies
RUN apt-get install -q -y \
@@ -145,6 +145,11 @@ RUN wget https://apt.llvm.org/llvm.sh && \
update-alternatives --install /usr/bin/llvm-cov llvm-cov-11 /usr/bin/llvm-cov-11 11 && \
rm ./llvm.sh
+# To generate webassmebly
+RUN wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sdk-20.0-linux.tar.gz && \
+ tar -xf wasi-sdk-20.0-linux.tar.gz && \
+ rm wasi-sdk-20.0-linux.tar.gz
+
# clean up apt caches
RUN apt-get clean && \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org