Remove SGX pins from base images

microsoft · Jan 14, 2025 · e8c1dc1 · e8c1dc1
1 parent a2c0ea1
commit e8c1dc1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 86 deletions.
diff --git a/.snpcc_canary b/.snpcc_canary
@@ -4,4 +4,4 @@
 /-xXx--//-----x=x--/-xXx--/---x---->>>--/
 ...
 /\/\d(-_-)b/\/\
-----vmpl
+----vmpl--
diff --git a/docker/README.md b/docker/README.md
@@ -9,5 +9,5 @@ To build a given image, run:
 
 ```bash
 $ cd CCF/
-$ docker build -t <tag> -f docker/<app_run|app_dev|ccf_ci> --build-arg="platform=<sgx|snp|virtual>" --build-arg="clang_version=<11|15>" .
+$ docker build -t <tag> -f docker/<app_run|app_dev|ccf_ci> --build-arg="platform=<snp|virtual>" --build-arg="clang_version=<15>" .
 ```
diff --git a/docker/app_dev b/docker/app_dev
@@ -1,27 +1,11 @@
 # Application Development image
 # Contains a CCF release for platform and toolchain for target platform
 
-ARG platform=sgx
+FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04
 
-# SGX
-FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-sgx
-
-WORKDIR /
-COPY ./docker/sgx_deps_pin.sh /
-RUN ./sgx_deps_pin.sh && rm /sgx_deps_pin.sh
-
-# SNP
-FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-snp
-
-# Virtual
-FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-virtual
-
-# Final dev image
-FROM base-${platform} AS final
-
-ARG platform=sgx
+ARG platform=snp
 ARG ansible_vars
-ARG clang_version=11
+ARG clang_version=15
 
 RUN echo "APT::Acquire::Retries \"5\";" | tee /etc/apt/apt.conf.d/80-retries
 

diff --git a/docker/app_run b/docker/app_run
@@ -1,27 +1,11 @@
 # Application Runtime image
 # Contains the cchost binary and its runtime dependencies for target platform
 
-ARG platform=sgx
+FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 
 
-# SGX
-FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-sgx
-
-WORKDIR /
-COPY ./docker/sgx_deps_pin.sh /
-RUN ./sgx_deps_pin.sh && rm ./sgx_deps_pin.sh
-
-# SNP
-FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-snp
-
-# Virtual
-FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-virtual
-
-# Final runtime image
-FROM base-${platform} AS final
-
-ARG platform=sgx
+ARG platform=snp
 ARG ansible_vars
-ARG clang_version=11
+ARG clang_version=15
 
 RUN echo "APT::Acquire::Retries \"5\";" | tee /etc/apt/apt.conf.d/80-retries
 

diff --git a/docker/ccf_ci b/docker/ccf_ci
@@ -1,26 +1,10 @@
 # CCF Continuous Integration image
 # Contains CCF build dependencies and toolchain for target platform
 
-ARG platform=sgx
+FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04
 
-# SGX
-FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-sgx
-
-WORKDIR /
-COPY ./docker/sgx_deps_pin.sh /
-RUN ./sgx_deps_pin.sh && rm ./sgx_deps_pin.sh
-
-# SNP
-FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-snp
-
-# Virtual
-FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 AS base-virtual
-
-# Final CCF CI image
-FROM base-${platform} AS final
-
-ARG platform=sgx
-ARG clang_version=11
+ARG platform
+ARG clang_version=15
 ARG ansible_vars
 
 RUN echo "APT::Acquire::Retries \"5\";" | tee /etc/apt/apt.conf.d/80-retries

diff --git a/docker/sgx_deps_pin.sh b/docker/sgx_deps_pin.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,4 @@ @@
     /-xXx--//-----x=x--/-xXx--/---x---->>>--/
     ...
     /\/\d(-_-)b/\/\
-    ----vmpl
+    ----vmpl--