Upgraded to CCF 3.0.12 (#149)

microsoft · Aug 31, 2023 · 96f3474 · 96f3474
1 parent 78fbbf6
commit 96f3474
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/ccf/app/dev:3.0.9-virtual
+FROM mcr.microsoft.com/ccf/app/dev:3.0.12-virtual
 
 # Dependency of the virtual build of attested-fetch.
 RUN apt-get update && apt-get install -y libcurl4-openssl-dev
diff --git a/.github/workflows/build-test-virtual.yml b/.github/workflows/build-test-virtual.yml
@@ -7,7 +7,7 @@ jobs:
       run:
         shell: bash
     container:
-      image: mcr.microsoft.com/ccf/app/dev:3.0.9-virtual
+      image: mcr.microsoft.com/ccf/app/dev:3.0.12-virtual
       env:
         # Helps to distinguish between CI and local builds.
         SCITT_CI: 1

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -17,7 +17,7 @@ jobs:
     name: Analyze
 
     runs-on: ubuntu-latest
-    container: mcr.microsoft.com/ccf/app/dev:3.0.9-virtual
+    container: mcr.microsoft.com/ccf/app/dev:3.0.12-virtual
 
     permissions:
       actions: read

diff --git a/.pipelines/azure-pipelines.yml b/.pipelines/azure-pipelines.yml
@@ -9,7 +9,7 @@ trigger:
 parameters:
   - name: CCF_VERSION
     type: string
-    default: 3.0.9
+    default: 3.0.12
 
 resources:
   containers:

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -24,10 +24,10 @@ Follow the steps below to setup your development environment, replacing `<sgx|vi
 
 2. Install dependencies:
     ```sh
-    wget https://github.com/microsoft/CCF/archive/refs/tags/ccf-3.0.9.tar.gz
-    tar xvzf ccf-3.0.9.tar.gz
-    cd CCF-ccf-3.0.9/getting_started/setup_vm/
-    ./run.sh app-dev.yml -e ccf_ver=3.0.9 -e platform=<sgx|virtual>
+    wget https://github.com/microsoft/CCF/archive/refs/tags/ccf-3.0.12.tar.gz
+    tar xvzf ccf-3.0.12.tar.gz
+    cd CCF-ccf-3.0.12/getting_started/setup_vm/
+    ./run.sh app-dev.yml -e ccf_ver=3.0.12 -e platform=<sgx|virtual>
     ```
 
 ## Building

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -30,9 +30,9 @@ if (CCF_UNSAFE)
     message(FATAL_ERROR "The unsafe CCF variant is only available on SGX builds.")
   endif()
 
-  find_package(ccf_sgx_unsafe 3.0.9 REQUIRED)
+  find_package(ccf_sgx_unsafe 3.0.12 REQUIRED)
 else()
-  find_package(ccf_${COMPILE_TARGET} 3.0.9 REQUIRED)
+  find_package(ccf_${COMPILE_TARGET} 3.0.12 REQUIRED)
 endif()
 
 if (ENABLE_PREFIX_TREE)

diff --git a/docker/enclave.Dockerfile b/docker/enclave.Dockerfile
@@ -1,4 +1,4 @@
-ARG CCF_VERSION=3.0.9
+ARG CCF_VERSION=3.0.12
 FROM mcr.microsoft.com/ccf/app/dev:${CCF_VERSION}-sgx as builder
 ARG CCF_VERSION
 ARG SCITT_VERSION_OVERRIDE

diff --git a/docker/virtual.Dockerfile b/docker/virtual.Dockerfile
@@ -1,4 +1,4 @@
-ARG CCF_VERSION=3.0.9
+ARG CCF_VERSION=3.0.12
 FROM mcr.microsoft.com/ccf/app/dev:${CCF_VERSION}-virtual as builder
 ARG CCF_VERSION
 ARG SCITT_VERSION_OVERRIDE

diff --git a/pyscitt/setup.py b/pyscitt/setup.py
@@ -13,7 +13,7 @@
     },
     python_requires=">=3.8",
     install_requires=[
-        "ccf==3.0.9",
+        "ccf==3.0.12",
         "cryptography==39.*",  # needs to match ccf
         "httpx",
         "cbor2",