Switch to rc2 (#476)

.azure-pipelines.yml

@@ -45,11 +45,11 @@ schedules:
 resources:
   containers:
     - container: nosgx
-      image: ccfciteam/ccf-ci-18.04-oe-0.7.0-rc1-nosgx:latest
+      image: ccfciteam/ccf-ci-18.04-oe-0.7.0-rc2-sgx:latest
       options: --publish-all --cap-add SYS_PTRACE -v /dev/shm:/ccache
 
     - container: sgx
-      image: ccfciteam/ccf-ci-18.04-oe-0.7.0-rc1-sgx:latest
+      image: ccfciteam/ccf-ci-18.04-oe-0.7.0-rc2-sgx:latest
       options: --publish-all --device /dev/sgx:/dev/sgx -v /dev/shm:/ccache
 
 jobs:

docker/Dockerfile.nosgx

@@ -1,9 +0,0 @@
-FROM ubuntu:18.04
-
-RUN echo "APT::Acquire::Retries \"5\";" | tee /etc/apt/apt.conf.d/80-retries
-
-COPY getting_started/setup_vm/ /setup_vm/
-RUN apt update && apt install -y ansible software-properties-common
-RUN cd setup_vm; ansible-playbook ccf-dependencies-no-sgx.yml ci-dependencies.yml
-
-RUN rm -rf /tmp/* && apt clean

getting_started/setup_vm/ccf-dependencies-no-sgx.yml

@@ -1,11 +0,0 @@
-- hosts: localhost
-  vars:
-    oe_playbook: scripts/ansible/oe-vanilla-prelibsgx-setup.yml
-    oe_build_opts: " -DUSE_LIBSGX=OFF"
-  tasks:
-    - import_role:
-        name: openenclave
-        tasks_from: install.yml
-    - import_role:
-        name: ccf_dependencies
-        tasks_from: install.yml

getting_started/setup_vm/roles/openenclave/vars/common.yml

@@ -1,5 +1,5 @@
 workspace: "/tmp/"
 oe_ver: "0.7.0-rc1"
 oe_src: "oe-{{ oe_ver }}.tar.gz"
-oe_url: "https://github.com/openenclave/openenclave/tarball/329167f6ba2bc9c23bd580a53b72a82cc6416dd5"
-oe_prefix: "/opt/openenclave"
+oe_url: "https://github.com/openenclave/openenclave/tarball/dab09ecd3d428c571b115621d68e2c9f995572e2"
+oe_prefix: "/opt/openenclave"

getting_started/setup_vm/setup_nodriver.sh

@@ -6,4 +6,4 @@ set -ex
 sudo add-apt-repository ppa:ansible/ansible -y
 sudo apt-get update
 sudo apt install ansible -y
-ansible-playbook ccf-dependencies-no-sgx.yml
+ansible-playbook ccf-dependencies-no-driver.yml

sphinx/source/quickstart/requirements.rst

@@ -134,7 +134,7 @@ On a machine without SGX, you can instead use:
 .. code-block:: bash
 
     $ cd CCF/getting_started/setup_vm
-    $ ./setup_nosgx.sh
+    $ ./setup_nodriver.sh
 
 .. _OpenEnclave: https://github.com/openenclave/openenclave
 .. _mbedtls: https://tls.mbed.org/