Skip to content

Commit c29ea31

Browse files
separate the intel-sgx-sdk and enclave docker image build
1 parent 70724a0 commit c29ea31

File tree

5 files changed

+61
-19
lines changed

5 files changed

+61
-19
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ jobs:
6868
username: ${{ github.actor }}
6969
password: ${{ github.token }}
7070
logout: true
71-
- id: meta
71+
- id: metadata
7272
uses: docker/metadata-action@v5
7373
with:
7474
images: ghcr.io/${{ github.repository }}/${{ github.event.inputs.enclave }}/${{ github.event.inputs.network }}
7575
tags: |
7676
type=sha,prefix=,format=long
7777
${{ github.event.inputs.tag }}
78-
- name: Build and Release
78+
- name: Build and Push
7979
uses: docker/build-push-action@v5
8080
id: docker_build_and_push
8181
with:
@@ -84,8 +84,8 @@ jobs:
8484
build-args: |
8585
LCP_ELC_TYPE=${{ github.event.inputs.enclave }}
8686
DEPLOYMENT_NETWORK=${{ github.event.inputs.network }}
87-
tags: ${{ steps.meta.outputs.tags }}
88-
labels: ${{ steps.meta.outputs.labels }}
87+
tags: ${{ steps.metadata.outputs.tags }}
88+
labels: ${{ steps.metadata.outputs.labels }}
8989
cache-from: type=registry,ref=ghcr.io/${{ github.repository }}/${{ github.event.inputs.enclave }}/${{ github.event.inputs.network }}:buildCache
9090
cache-to: type=registry,ref=ghcr.io/${{ github.repository }}/${{ github.event.inputs.enclave }}/${{ github.event.inputs.network }}:buildCache,mode=max
9191
- name: Create Release

.github/workflows/sgxsdk.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: SgxSDK
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
push:
8+
runs-on: ubuntu-24.04
9+
permissions:
10+
contents: read # checkout
11+
packages: write # Push Docker Image to ghcr.io
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: docker/setup-buildx-action@v3
15+
- uses: docker/login-action@v3
16+
with:
17+
registry: ghcr.io
18+
username: ${{ github.actor }}
19+
password: ${{ github.token }}
20+
logout: true
21+
- id: metadata
22+
uses: docker/metadata-action@v5
23+
with:
24+
images: ghcr.io/${{ github.repository }}/intel-sgx-sdk
25+
tags: |
26+
type=sha,prefix=,format=long
27+
- name: Build and Push
28+
uses: docker/build-push-action@v5
29+
id: docker_build_and_push
30+
with:
31+
context: ./sgxsdk
32+
push: true
33+
tags: ${{ steps.metadata.outputs.tags }}
34+
labels: ${{ steps.metadata.outputs.labels }}
35+
cache-from: type=registry,ref=ghcr.io/${{ github.repository }}/intel-sgx-sdk:buildCache
36+
cache-to: type=registry,ref=ghcr.io/${{ github.repository }}/intel-sgx-sdk:buildCache,mode=max

Dockerfile

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
FROM ubuntu:noble-20250529
2-
3-
ARG INTEL_SGX_SDK_VERSION=2.25.100.3
4-
LABEL com.intel.sgx.sdk.version=$INTEL_SGX_SDK_VERSION
1+
FROM ghcr.io/datachainlab/toki-bridge-lcp-enclaves/intel-sgx-sdk:70724a0e3fd3818a75b9976da2957fc9b728f41c
52

63
ARG RUST_TOOLCHAIN_VERSION=nightly-2024-09-05
74
LABEL org.rust-lang.org.toolchain.version=$RUST_TOOLCHAIN_VERSION
@@ -16,17 +13,7 @@ ENV DEBIAN_FRONTEND=noninteractive
1613

1714
WORKDIR /app
1815

19-
# ref: https://github.com/intel/linux-sgx/blob/sgx_2.25/README.md#install-the-intelr-sgx-sdk
20-
RUN apt update && apt install -y \
21-
build-essential=12.10ubuntu1 \
22-
curl file python-is-python3 && \
23-
rm -rf /var/lib/apt/lists/*
24-
25-
ENV INTEL_SGX_SDK_VERSION=$INTEL_SGX_SDK_VERSION
26-
2716
ADD ./scripts ./scripts
28-
RUN bash ./scripts/install_build_dependencies.sh
29-
3017
ENV rust_toolchain=$RUST_TOOLCHAIN_VERSION
3118
RUN bash ./scripts/install_rust.sh
3219

sgxsdk/Dockerfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM ubuntu:noble-20250529
2+
3+
ARG INTEL_SGX_SDK_VERSION=2.25.100.3
4+
LABEL com.intel.sgx.sdk.version=$INTEL_SGX_SDK_VERSION
5+
6+
ENV DEBIAN_FRONTEND=noninteractive
7+
8+
WORKDIR /app
9+
10+
# ref: https://github.com/intel/linux-sgx/blob/sgx_2.25/README.md#install-the-intelr-sgx-sdk
11+
RUN apt update && apt install -y \
12+
build-essential=12.10ubuntu1 \
13+
curl file python-is-python3 && \
14+
rm -rf /var/lib/apt/lists/*
15+
16+
ENV INTEL_SGX_SDK_VERSION=$INTEL_SGX_SDK_VERSION
17+
18+
ADD ./scripts ./scripts
19+
RUN bash ./scripts/install_sgx_sdk.sh
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ cd /root && \
88
curl -o sdk.sh $SDK_URL && \
99
chmod a+x /root/sdk.sh && \
1010
echo -e 'no\n/opt' | ./sdk.sh && \
11-
echo 'source /opt/sgxsdk/environment' >> /root/.bashrc && \
11+
echo 'source /opt/sgxsdk.yml/environment' >> /root/.bashrc && \
1212
cd /root && \
1313
rm ./sdk.sh

0 commit comments

Comments
 (0)