Update to CCF 4.0.14 (#24)

Author: achamayou

.devcontainer/Dockerfile

@@ -1,3 +1,3 @@
-FROM mcr.microsoft.com/ccf/app/dev:3.0.1-virtual
+FROM mcr.microsoft.com/ccf/app/dev:4.0.14-virtual
 
 RUN curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash - && sudo apt-get install -y nodejs

.github/workflows/ci.yml

@@ -9,35 +9,35 @@ on:
 jobs:
   build-cpp-app-sgx:
     runs-on: ubuntu-20.04
-    container: mcr.microsoft.com/ccf/app/dev:3.0.1-sgx
+    container: mcr.microsoft.com/ccf/app/dev:4.0.14-sgx
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build app (SGX)
-        run: mkdir -p build && cd build && CC="/opt/oe_lvi/clang-10" CXX="/opt/oe_lvi/clang++-10" cmake -GNinja -DCOMPILE_TARGET=sgx .. && ninja
+        run: mkdir -p build && cd build && CC="clang-11" CXX="clang++-11" cmake -GNinja -DCOMPILE_TARGET=sgx .. && ninja
         working-directory: cpp
 
   build-cpp-app-virtual:
     runs-on: ubuntu-20.04
-    container: mcr.microsoft.com/ccf/app/dev:3.0.1-virtual
+    container: mcr.microsoft.com/ccf/app/dev:4.0.14-virtual
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build app (virtual)
-        run: mkdir -p build && cd build && CC="$(which clang-10)" CXX="$(which clang++-10)" cmake -GNinja -DCOMPILE_TARGET=virtual .. && ninja
+        run: mkdir -p build && cd build && CC="$(which clang-15)" CXX="$(which clang++-15)" cmake -GNinja -DCOMPILE_TARGET=virtual .. && ninja
         working-directory: cpp
 
   build-containers:
     runs-on: ubuntu-20.04
-    container: mcr.microsoft.com/ccf/app/dev:3.0.1-sgx
+    container: mcr.microsoft.com/ccf/app/dev:4.0.14-sgx
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build C++ enclave container
         run: docker build -t ccf-app-template:cpp-enclave -f docker/ccf_app_cpp.enclave .

README.md

@@ -122,7 +122,7 @@ In the checkout of this repository:
 ```bash
 $ cd cpp/
 $ mkdir build && cd build
-$ CC="/opt/oe_lvi/clang-10" CXX="/opt/oe_lvi/clang++-10" cmake -GNinja ..
+$ CC="clang-11" CXX="clang++-11" cmake -GNinja ..
 $ ninja
 $ ls
 libccf_app.enclave.so.signed # SGX-enabled application
@@ -175,10 +175,10 @@ $ docker run ccf-app-template:cpp-virtual
 If this repository is checked out on a bare VM (e.g. [for SGX deployments](https://docs.microsoft.com/en-us/azure/confidential-computing/quick-create-portal)), the dependencies required to build and run the C++ app can be installed as follows:
 
 ```bash
-$ wget https://github.com/microsoft/CCF/releases/download/ccf-2.0.0/ccf_2.0.7_amd64.deb
-$ sudo dpkg -i ccf_2.0.7_amd64.deb # Install CCF under /opt/ccf
-$ cat /opt/ccf/share/VERSION_LONG
-ccf-2.0.7
+$ wget https://github.com/microsoft/CCF/releases/download/ccf-4.0.14/ccf_virtual_4.0.14_amd64.deb
+$ sudo dpkg -i ccf_virtual_4.0.14_amd64.deb # Install CCF under /opt/ccf
+$ cat /opt/ccf_virtual/share/VERSION_LONG
+ccf-4.0.14
 $ /opt/ccf/getting_started/setup_vm/run.sh /opt/ccf/getting_started/setup_vm/app-dev.yml # Install dependencies
 ```
 

docker/ccf_app_cpp.enclave

@@ -1,12 +1,12 @@
 # Build
-FROM mcr.microsoft.com/ccf/app/dev:3.0.1-sgx as builder
+FROM mcr.microsoft.com/ccf/app/dev:4.0.14-sgx as builder
 COPY ./cpp /cpp
 RUN mkdir -p /build/
 WORKDIR /build/
-RUN CC="/opt/oe_lvi/clang-10" CXX="/opt/oe_lvi/clang++-10" cmake -DCOMPILE_TARGET=sgx -GNinja /cpp && ninja
+RUN CC="clang-11" CXX="clang++-11" cmake -DCOMPILE_TARGET=sgx -GNinja /cpp && ninja
 
 # Run
-FROM mcr.microsoft.com/ccf/app/run:3.0.1-sgx
+FROM mcr.microsoft.com/ccf/app/run:4.0.14-sgx
 
 COPY --from=builder /build/libccf_app.enclave.so.signed /app/
 COPY --from=builder /opt/ccf_sgx/bin/*.js /app/

docker/ccf_app_cpp.virtual

@@ -1,12 +1,12 @@
 # Build
-FROM mcr.microsoft.com/ccf/app/dev:3.0.1-virtual as builder
+FROM mcr.microsoft.com/ccf/app/dev:4.0.14-virtual as builder
 COPY ./cpp /cpp
 RUN mkdir -p /build/
 WORKDIR /build/
-RUN CC="$(which clang-10)" CXX="$(which clang++-10)" cmake -GNinja -DCOMPILE_TARGET=virtual /cpp && ninja
+RUN CC="clang-15" CXX="clang++-15" cmake -GNinja -DCOMPILE_TARGET=virtual /cpp && ninja
 
 # Run
-FROM mcr.microsoft.com/ccf/app/run:3.0.1-virtual
+FROM mcr.microsoft.com/ccf/app/run:4.0.14-virtual
 
 COPY --from=builder /build/libccf_app.virtual.so /app/
 COPY --from=builder /opt/ccf_virtual/bin/*.js /app/

docker/ccf_app_js.enclave

@@ -1,8 +1,8 @@
 # Build
-FROM mcr.microsoft.com/ccf/app/dev:3.0.1-sgx as builder
+FROM mcr.microsoft.com/ccf/app/dev:4.0.14-sgx as builder
 
 # Run
-FROM mcr.microsoft.com/ccf/app/run-js:3.0.1-sgx
+FROM mcr.microsoft.com/ccf/app/run-js:4.0.14-sgx
 
 COPY --from=builder /opt/ccf_sgx/bin/*.js /app/
 COPY --from=builder /opt/ccf_sgx/bin/keygenerator.sh /app/ 

docker/ccf_app_js.virtual

@@ -1,8 +1,8 @@
 # Build
-FROM mcr.microsoft.com/ccf/app/dev:3.0.1-virtual as builder
+FROM mcr.microsoft.com/ccf/app/dev:4.0.14-virtual as builder
 
 # Run
-FROM mcr.microsoft.com/ccf/app/run-js:3.0.1-virtual
+FROM mcr.microsoft.com/ccf/app/run-js:4.0.14-virtual
 
 # Note: libjs_generic.virtual is not included in run-js container
 COPY --from=builder /opt/ccf_virtual/lib/libjs_generic.virtual.so /usr/lib/ccf

js/package.json

@@ -10,7 +10,7 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@microsoft/ccf-app": "^3.0.1"
+    "@microsoft/ccf-app": "^4.0.14"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^17.1.0",