You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by ms...@apache.org on 2021/05/27 18:06:13 UTC
[incubator-teaclave-trustzone-sdk] branch docker created (now
992cb63)
This is an automated email from the ASF dual-hosted git repository.
mssun pushed a change to branch docker
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git.
at 992cb63 Use Teaclave's dockerhub account
This branch includes the following new commits:
new 992cb63 Use Teaclave's dockerhub account
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org
[incubator-teaclave-trustzone-sdk] 01/01: Use Teaclave's dockerhub
account
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch docker
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
commit 992cb63fa306c857409b6a0bd142f9dd76c61d8a
Author: Mingshen Sun <bo...@mssun.me>
AuthorDate: Thu May 27 11:05:58 2021 -0700
Use Teaclave's dockerhub account
---
.travis.yml | 2 +-
Dockerfile | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 6a76dbc..65882b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ script:
- (cd optee-utee && xargo build --target aarch64-unknown-optee-trustzone -vv)
- (cd optee-teec && cargo build --target aarch64-unknown-linux-gnu -vv)
- make examples
- - docker run --rm -it -v$(pwd):/rust-optee-trustzone-sdk -w /rust-optee-trustzone-sdk mesalocklinux/rust-optee-trustzone-sdk-qemuv8-ci bash -c "cd ci && ./ci.sh"
+ - docker run --rm -it -v$(pwd):/teaclave-trustzone-sdk -w /teaclave-trustzone-sdk teaclave/teaclave-trustzone-sdk-build:0.1.0 bash -c "cd ci && ./ci.sh"
cache:
timeout: 1000
diff --git a/Dockerfile b/Dockerfile
index ead96be..fc257d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,13 +9,14 @@ RUN apt-get update && \
libpixman-1-dev libssl-dev libstdc++6:i386 libtool libz1:i386 make \
mtools netcat python-crypto python-serial python-wand unzip uuid-dev \
xdg-utils xterm xz-utils zlib1g-dev git wget cpio libssl-dev iasl \
- screen libbrlapi-dev libaio-dev libcurl3 libbluetooth-dev
+ screen libbrlapi-dev libaio-dev libcurl3 libbluetooth-dev libsdl2-2.0
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
. $HOME/.cargo/env && \
rustup default nightly-2019-07-08 && \
rustup component add rust-src && \
rustup target install aarch64-unknown-linux-gnu && \
- cargo install --git https://github.com/mssun/xargo.git --branch mssun/relative-patch-path --force
+ rustup default 1.44.0 && cargo +1.44.0 install xargo && \
+ rustup default nightly-2019-07-08
ENV PATH="/root/.cargo/bin:$PATH"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org