From 7cca0f20591292a40fbb67fb50fdacc1a98b7ab7 Mon Sep 17 00:00:00 2001 From: Yuan Zhuang Date: Fri, 22 May 2026 08:10:53 +0000 Subject: [PATCH 1/2] deploy: fix ci action error --- .github/workflows/_reusable-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_reusable-build.yml b/.github/workflows/_reusable-build.yml index 5a22ee17cc..2bc196de32 100644 --- a/.github/workflows/_reusable-build.yml +++ b/.github/workflows/_reusable-build.yml @@ -37,14 +37,14 @@ jobs: fetch-depth: 1 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3.7.1 + uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f timeout-minutes: 5 with: driver: docker-container install: true - name: Build Docker image - uses: docker/build-push-action@v6.9.0 + uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 timeout-minutes: 30 with: context: . From 1bc4788e985aaecb9e413f7a3a7dd40c6449e215 Mon Sep 17 00:00:00 2001 From: Zehui Chen Date: Fri, 22 May 2026 17:57:59 +0800 Subject: [PATCH 2/2] Dockerfile: update trustzone image --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b4196658b1..47e7c5b784 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ # SGX Docs stage -FROM teaclave/teaclave-build-ubuntu-1804-sgx-2.14:latest AS sgx-docs +FROM teaclave/teaclave-build-ubuntu-2004-sgx-2.17.1:0.2.0 AS sgx-docs WORKDIR /app +RUN (apt update || true) && apt install -y ca-certificates && update-ca-certificates COPY sgx-sdk-api-docs /app/sgx-sdk-api-docs RUN . "$HOME/.cargo/env" && cd sgx-sdk-api-docs && cargo doc RUN mkdir -p /prebuilt_docs && \ cp -r sgx-sdk-api-docs/target/doc /prebuilt_docs/sgx-sdk-docs # Trustzone Docs stage -FROM teaclave/teaclave-trustzone-emulator-std-optee-4.5.0-expand-memory:latest AS tz-docs +FROM teaclave/teaclave-trustzone-emulator-std-expand-memory:latest AS tz-docs WORKDIR /app COPY tz-sdk-api-docs /app/tz-sdk-api-docs RUN . /opt/teaclave/setup/bootstrap_env && \ . /opt/teaclave/environment && \ - . $HOME/.cargo/env && \ cd tz-sdk-api-docs && cargo doc RUN mkdir -p /prebuilt_docs && \ cp -r tz-sdk-api-docs/target/doc /prebuilt_docs/tz-sdk-docs @@ -45,4 +45,4 @@ RUN apt-get update && apt-get install -y \ python3-pip \ git \ curl -RUN pip3 install --break-system-packages ghp-import \ No newline at end of file +RUN pip3 install --break-system-packages ghp-import