revert docker compose yaml version and cleanup

Signed-off-by: Bruno Vavala <bruno.vavala@intel.com>
hyperledger-labs · Oct 24, 2022 · b754d72 · b754d72
1 parent e9e4ea9
commit b754d72
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/docker/ccf-pdo.local-code.yaml b/docker/ccf-pdo.local-code.yaml
@@ -26,7 +26,7 @@
 # though only with docker version 18.09+ (look for --secret/--ssh parameters)
 
 
-version: "2.2"
+version: "2.1"
 
 services:
 

diff --git a/docker/ccf-pdo.proxy.yaml b/docker/ccf-pdo.proxy.yaml
@@ -21,7 +21,7 @@
 # docker-compose installed in docker-compose versions in ubuntu 18.04. Later
 # versions, e.g., the one in 20.04, will honor that and will make this file obsolete ..
 
-version: "2.2"
+version: "2.1"
 
 services:
 

diff --git a/docker/ccf-pdo.yaml b/docker/ccf-pdo.yaml
@@ -35,7 +35,7 @@
 #   - for automated tests, you also just might call 'docker-compose  -f ccf-pdo.yaml exec pdo-build bash -i -c /project/pdo/src/private-data-objects/build/__tools__/run-tests.sh'
 # - ....
 
-version: "2.2"
+version: "2.1"
 
 services:
   # PDO EHS, PS and client ...

diff --git a/docker/ccf.local-code.yaml b/docker/ccf.local-code.yaml
@@ -26,7 +26,7 @@
 # though only with docker version 18.09+ (look for --secret/--ssh parameters)
 
 
-version: "2.2"
+version: "2.1"
 
 services:
 

diff --git a/docker/ccf.proxy.yaml b/docker/ccf.proxy.yaml
@@ -21,7 +21,7 @@
 # docker-compose installed in docker-compose versions in ubuntu 18.04. Later
 # versions, e.g., the one in 20.04, will honor that and will make this file obsolete ..
 
-version: "2.2"
+version: "2.1"
 
 services:
 

diff --git a/docker/ccf.yaml b/docker/ccf.yaml
@@ -35,7 +35,7 @@
 #   - for automated tests, you also just might call 'docker-compose  -f ccf-pdo.yaml exec pdo-build bash -i -c /project/pdo/src/private-data-objects/build/__tools__/run-tests.sh'
 # - ....
 
-version: "2.2"
+version: "2.1"
 
 services:
   pdo-tp-ccf:

diff --git a/docker/pdo.sgx.yaml b/docker/pdo.sgx.yaml
@@ -33,7 +33,7 @@
 #    source /project/pdo/src/private-data-objects/build/common-config.sh
 #    make -C /project/pdo/src/private-data-objects/build conf register
 
-version: "2.2"
+version: "2.1"
 
 services:
 
@@ -44,7 +44,6 @@ services:
     build:
       args:
         SGX_MODE: HW
-      network: host
     volumes:
       - ${PDO_SGX_KEY_ROOT:-./sgx/}:/project/pdo/build/opt/pdo/etc/keys/sgx/
       - /var/run/aesmd:/var/run/aesmd

diff --git a/eservice/pdo/eservice/enclave/enclave/signup.cpp b/eservice/pdo/eservice/enclave/enclave/signup.cpp
@@ -185,7 +185,7 @@ pdo_err_t pdo::enclave_api::enclave_data::CreateEnclaveData(
     return result;
 } // pdo::enclave_api::base::CreateSignupData
 
-/// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 pdo_err_t pdo::enclave_api::enclave_data::UnsealEnclaveData(
     const Base64EncodedString& inSealedEnclaveData,
     StringArray& outPublicEnclaveData