Skip to content

Commit 256c5c7

Browse files
achamayouachamayou
authored
Remove SGX pins from base images (#6757)
1 parent c241dd7 commit 256c5c7

File tree

20 files changed

+29
-151
lines changed

20 files changed

+29
-151
lines changed

‎.azure-pipelines-templates/deploy_aci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
env:
5151
ACR_REGISTRY_RESOURCE_NAME: ccfmsrc
5252
ACR_REGISTRY: ccfmsrc.azurecr.io
53-
BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
53+
BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
5454
5555
- script: |
5656
set -ex

‎.azure_pipelines_snp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ schedules:
2222
resources:
2323
containers:
2424
- container: virtual
25-
image: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
25+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
2626
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
2727

2828
jobs:

‎.github/workflows/bencher.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Continuous Benchmarking with Bencher
1414
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
1515
container:
16-
image: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
16+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
1717
steps:
1818
- uses: actions/checkout@v4
1919
with:

‎.github/workflows/ci-verification.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: Model Checking - Consistency
2525
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
2626
container:
27-
image: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
27+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
2828
defaults:
2929
run:
3030
working-directory: tla
@@ -102,7 +102,7 @@ jobs:
102102
name: Model Checking - Consensus
103103
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
104104
container:
105-
image: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
105+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
106106
defaults:
107107
run:
108108
working-directory: tla
@@ -158,7 +158,7 @@ jobs:
158158
name: Trace Validation - Consensus
159159
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
160160
container:
161-
image: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
161+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
162162

163163
steps:
164164
- uses: actions/checkout@v4

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
checks:
2121
name: "Format and License Checks"
2222
runs-on: ubuntu-latest
23-
container: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
23+
container: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
2424

2525
steps:
2626
- run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -44,7 +44,7 @@ jobs:
4444
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
4545
runs-on: ${{ matrix.platform.nodes }}
4646
container:
47-
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-08-01-2025-2
47+
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-14-01-2025
4848
options: ${{ matrix.platform.options }}
4949
steps:
5050
- uses: actions/checkout@v4

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# Insufficient space to run on public runner, so use custom pool
2626
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
2727
container:
28-
image: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
28+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
2929
options: --user root
3030

3131
permissions:

‎.github/workflows/long-test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
1818
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
1919
container:
20-
image: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
20+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
2121

2222
steps:
2323
- uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
3535
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
3636
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
3737
container:
38-
image: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
38+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
3939

4040
steps:
4141
- uses: actions/checkout@v4
@@ -79,7 +79,7 @@ jobs:
7979
name: TSAN
8080
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
8181
container:
82-
image: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
82+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
8383

8484
steps:
8585
- uses: actions/checkout@v4
@@ -117,7 +117,7 @@ jobs:
117117
name: LTS
118118
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
119119
container:
120-
image: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
120+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
121121

122122
steps:
123123
- uses: actions/checkout@v4

‎.github/workflows/long-verification.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-verification') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
2323
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
2424
container:
25-
image: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
25+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
2626
defaults:
2727
run:
2828
working-directory: tla
@@ -50,7 +50,7 @@ jobs:
5050
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-verification') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
5151
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
5252
container:
53-
image: ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
53+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
5454
defaults:
5555
run:
5656
working-directory: tla

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
nodes: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
7676
runs-on: ${{ matrix.platform.nodes }}
7777
container:
78-
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-08-01-2025-2
78+
image: ghcr.io/microsoft/ccf/ci/${{ matrix.platform.image }}:build-14-01-2025
7979
options: "--user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro ${{ matrix.platform.container_options }}"
8080
steps:
8181
- uses: actions/checkout@v4

‎.snpcc_canary

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
/-xXx--//-----x=x--/-xXx--/---x---->>>--/
55
...
66
/\/\d(-_-)b/\/\
7-
----vmpl
7+
----vmpl--

‎docker/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ To build a given image, run:
99

1010
```bash
1111
$ cd CCF/
12-
$ docker build -t <tag> -f docker/<app_run|app_dev|ccf_ci> --build-arg="platform=<sgx|snp|virtual>" --build-arg="clang_version=<11|15>" .
12+
$ docker build -t <tag> -f docker/<app_run|app_dev|ccf_ci> --build-arg="platform=<snp|virtual>" --build-arg="clang_version=<15>" .
1313
```

‎docker/app_dev

+3-19
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,11 @@
11
# Application Development image
22
# Contains a CCF release for platform and toolchain for target platform
33

4-
ARG platform=sgx
4+
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04
55

6-
# SGX
7-
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-sgx
8-
9-
WORKDIR /
10-
COPY ./docker/sgx_deps_pin.sh /
11-
RUN ./sgx_deps_pin.sh && rm /sgx_deps_pin.sh
12-
13-
# SNP
14-
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-snp
15-
16-
# Virtual
17-
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-virtual
18-
19-
# Final dev image
20-
FROM base-${platform} AS final
21-
22-
ARG platform=sgx
6+
ARG platform=snp
237
ARG ansible_vars
24-
ARG clang_version=11
8+
ARG clang_version=15
259

2610
RUN echo "APT::Acquire::Retries \"5\";" | tee /etc/apt/apt.conf.d/80-retries
2711

‎docker/app_run

+3-19
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,11 @@
11
# Application Runtime image
22
# Contains the cchost binary and its runtime dependencies for target platform
33

4-
ARG platform=sgx
4+
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04
55

6-
# SGX
7-
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-sgx
8-
9-
WORKDIR /
10-
COPY ./docker/sgx_deps_pin.sh /
11-
RUN ./sgx_deps_pin.sh && rm ./sgx_deps_pin.sh
12-
13-
# SNP
14-
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-snp
15-
16-
# Virtual
17-
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-virtual
18-
19-
# Final runtime image
20-
FROM base-${platform} AS final
21-
22-
ARG platform=sgx
6+
ARG platform=snp
237
ARG ansible_vars
24-
ARG clang_version=11
8+
ARG clang_version=15
259

2610
RUN echo "APT::Acquire::Retries \"5\";" | tee /etc/apt/apt.conf.d/80-retries
2711

‎docker/ccf_ci

+3-19
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,10 @@
11
# CCF Continuous Integration image
22
# Contains CCF build dependencies and toolchain for target platform
33

4-
ARG platform=sgx
4+
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04
55

6-
# SGX
7-
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-sgx
8-
9-
WORKDIR /
10-
COPY ./docker/sgx_deps_pin.sh /
11-
RUN ./sgx_deps_pin.sh && rm ./sgx_deps_pin.sh
12-
13-
# SNP
14-
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-snp
15-
16-
# Virtual
17-
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-virtual
18-
19-
# Final CCF CI image
20-
FROM base-${platform} AS final
21-
22-
ARG platform=sgx
23-
ARG clang_version=11
6+
ARG platform
7+
ARG clang_version=15
248
ARG ansible_vars
259

2610
RUN echo "APT::Acquire::Retries \"5\";" | tee /etc/apt/apt.conf.d/80-retries

‎docker/ccf_ci_built

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Also contains CCF source and build directory
44

55
# Latest image as of this change
6-
ARG base=ghcr.io/microsoft/ccf/ci/default:build-08-01-2025-2
6+
ARG base=ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
77
FROM ${base}
88

99
# SSH. Note that this could (should) be done in the base ccf_ci image instead

‎docker/sgx_deps_pin.sh

-27
This file was deleted.

‎getting_started/setup_vm/roles/ccf_build/vars/clang15.yml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ debs:
1717
- expect
1818
- git
1919
- ccache
20-
- kmod # modinfo for sgxinfo.sh
2120
- cmake
2221
- libssl-dev
2322
- libnghttp2-dev # experimental http2 support

‎getting_started/setup_vm/roles/ccf_install/tasks/deb_install.yml

-8
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@
3333
become: true
3434
when: run_js|bool
3535

36-
- name: Copy JS generic (SGX)
37-
copy:
38-
src: "/opt/ccf_{{ platform }}/lib/{{ ccf_js_app_name }}.enclave.so.signed"
39-
dest: "/usr/lib/ccf/{{ ccf_js_app_name }}.enclave.so.signed"
40-
remote_src: true
41-
become: true
42-
when: (run_js|bool) and (platform == "sgx")
43-
4436
- name: Copy JS generic (Virtual)
4537
copy:
4638
src: "/opt/ccf_{{ platform }}/lib/{{ ccf_js_app_name }}.virtual.so"

‎getting_started/setup_vm/roles/ccf_install/vars/common.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
ccf_ver: "latest"
22
run_js: false
33
ccf_js_app_name: "libjs_generic"
4-
platform: "sgx"
4+
platform: "snp"

‎samples/scripts/sgxinfo.sh

-38
This file was deleted.

0 commit comments

Comments
 (0)