diff --git a/.azure-pipelines-gh-pages.yml b/.azure-pipelines-gh-pages.yml index 4088607a87c4..b55ce678f9c0 100644 --- a/.azure-pipelines-gh-pages.yml +++ b/.azure-pipelines-gh-pages.yml @@ -11,7 +11,7 @@ jobs: variables: Codeql.SkipTaskAutoInjection: true skipComponentGovernanceDetection: true - container: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15 + container: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-virtual-clang15 pool: vmImage: ubuntu-20.04 diff --git a/.azure-pipelines-templates/deploy_aci.yml b/.azure-pipelines-templates/deploy_aci.yml index c307fde94722..b657fbcd681d 100644 --- a/.azure-pipelines-templates/deploy_aci.yml +++ b/.azure-pipelines-templates/deploy_aci.yml @@ -50,7 +50,7 @@ jobs: - script: | set -ex docker login -u $ACR_TOKEN_NAME -p $ACR_CI_PUSH_TOKEN_PASSWORD $ACR_REGISTRY - docker pull $ACR_REGISTRY/ccf/ci:14-08-2023-snp-clang15 + docker pull $ACR_REGISTRY/ccf/ci:16-08-2023-1-snp-clang15 docker build -f docker/ccf_ci_built . --build-arg="base=$BASE_IMAGE" --build-arg="platform=snp" -t $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD` docker push $ACR_REGISTRY/ccf/ci:pr-`git rev-parse HEAD` name: build_ci_image @@ -59,7 +59,7 @@ jobs: ACR_TOKEN_NAME: ci-push-token ACR_CI_PUSH_TOKEN_PASSWORD: $(ACR_CI_PUSH_TOKEN_PASSWORD) ACR_REGISTRY: ccfmsrc.azurecr.io - BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-snp-clang15 + BASE_IMAGE: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-snp-clang15 - script: | set -ex diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 0d10be7963df..14961f3494e7 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -29,15 +29,15 @@ schedules: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: snp - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-snp-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-snp-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-sgx + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-sgx options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx -v /lib/modules:/lib/modules:ro variables: diff --git a/.azure_pipelines_snp.yml b/.azure_pipelines_snp.yml index dab28fa7b429..9010c1667b60 100644 --- a/.azure_pipelines_snp.yml +++ b/.azure_pipelines_snp.yml @@ -35,7 +35,7 @@ variables: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro jobs: diff --git a/.daily.yml b/.daily.yml index 7a01147ad77b..665cb37370f7 100644 --- a/.daily.yml +++ b/.daily.yml @@ -25,15 +25,15 @@ schedules: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE - container: snp - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-snp-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-snp-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-sgx + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-sgx options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx jobs: diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d126a7ff0c42..e7c143f59e55 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "CCF Development Environment", - "image": "ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15", + "image": "ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-virtual-clang15", "runArgs": [], "extensions": [ "eamodio.gitlens", diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index 669151e642a3..cd3477df0035 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -9,7 +9,7 @@ on: jobs: checks: runs-on: ubuntu-latest - container: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15 + container: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-virtual-clang15 steps: - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" diff --git a/.multi-thread.yml b/.multi-thread.yml index 466e5bb9c55d..7e90377ee79d 100644 --- a/.multi-thread.yml +++ b/.multi-thread.yml @@ -16,7 +16,7 @@ pr: resources: containers: - container: virtual - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-virtual-clang15 + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-virtual-clang15 options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro jobs: diff --git a/.stress.yml b/.stress.yml index 780d707d0069..a0bdfce012b2 100644 --- a/.stress.yml +++ b/.stress.yml @@ -20,7 +20,7 @@ schedules: resources: containers: - container: sgx - image: ccfmsrc.azurecr.io/ccf/ci:14-08-2023-sgx + image: ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-sgx options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --device /dev/sgx_enclave:/dev/sgx_enclave --device /dev/sgx_provision:/dev/sgx_provision -v /dev/sgx:/dev/sgx jobs: diff --git a/docker/ccf_ci_built b/docker/ccf_ci_built index 29585ae4e5a2..65a7d24d6ea5 100644 --- a/docker/ccf_ci_built +++ b/docker/ccf_ci_built @@ -4,7 +4,7 @@ # Latest image as of this change ARG platform=sgx -ARG base=ccfmsrc.azurecr.io/ccf/ci:14-08-2023-snp-clang-15 +ARG base=ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-snp-clang-15 FROM ${base} # SSH. Note that this could (should) be done in the base ccf_ci image instead diff --git a/getting_started/setup_vm/roles/autoremove/install.yml b/getting_started/setup_vm/roles/autoremove/install.yml new file mode 100644 index 000000000000..c439ff434dc1 --- /dev/null +++ b/getting_started/setup_vm/roles/autoremove/install.yml @@ -0,0 +1,11 @@ +- name: Remove graphviz debian package + apt: + name: graphviz + state: absent + become: yes + +- name: Remove any uncessary packages + apt: + name: "autoremove" + autoremove: yes + become: yes diff --git a/getting_started/setup_vm/roles/ccf_build/vars/clang11.yml b/getting_started/setup_vm/roles/ccf_build/vars/clang11.yml index 45d6f4887d57..306691cd32ed 100644 --- a/getting_started/setup_vm/roles/ccf_build/vars/clang11.yml +++ b/getting_started/setup_vm/roles/ccf_build/vars/clang11.yml @@ -28,7 +28,6 @@ debs: - libclang1-9 # required to build doxygen - libclang-cpp9 # required to build doxygen - pkg-config # required by v8 - - graphviz # required to run doxygen - unzip # required to unzip protoc install # Not installed on GitHub Actions environment because of conflicting package diff --git a/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml b/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml index de43678752d4..4f545cc04e3d 100644 --- a/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml +++ b/getting_started/setup_vm/roles/ccf_build/vars/clang15.yml @@ -28,7 +28,6 @@ debs: - libclang1-9 # required to build doxygen - libclang-cpp9 # required to build doxygen - pkg-config # required by v8 - - graphviz # required to run doxygen - unzip # required to unzip protoc install # Not installed on GitHub Actions environment because of conflicting package diff --git a/scripts/azure_deployment/arm_aci.py b/scripts/azure_deployment/arm_aci.py index d16e2d46d1a1..582d3d11dc1c 100644 --- a/scripts/azure_deployment/arm_aci.py +++ b/scripts/azure_deployment/arm_aci.py @@ -178,7 +178,7 @@ def parse_aci_args(parser: ArgumentParser) -> Namespace: "--aci-image", help="The name of the image to deploy in the ACI", type=str, - default="ccfmsrc.azurecr.io/ccf/ci:14-08-2023-snp", + default="ccfmsrc.azurecr.io/ccf/ci:16-08-2023-1-snp", ) parser.add_argument( "--aci-type",