Skip to content

Commit

Permalink
upgraded to CCF 3.0.12
Browse files Browse the repository at this point in the history
  • Loading branch information
vimauro committed Aug 31, 2023
1 parent 78fbbf6 commit e16faa7
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/build-test-virtual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ trigger:
parameters:
- name: CCF_VERSION
type: string
default: 3.0.9
default: 3.0.12

resources:
containers:
Expand Down
8 changes: 4 additions & 4 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docker/enclave.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/virtual.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyscitt/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit e16faa7

Please sign in to comment.