Registry update (#21)

* registry update to acr

* update deployment, registry service info

* README change

* minor doc update

* update contract service url

README.md

@@ -19,6 +19,7 @@ Alternatively, you can build and develop locally in a Linux environment (we have
 - [docker](https://docs.docker.com/engine/install/ubuntu/) and docker-compose. After installing docker, add your user to the docker group using `sudo usermod -aG docker $USER`, and log back in to a shell. 
 - make (install using ```sudo apt-get install make```)
 - Python 3.6.9 and pip 
+- [Go](https://go.dev/doc/install). Follow the instructions to install Go. After installing, ensure that the PATH environment variable is set to include ```go``` runtime.
 - Python wheel package (install using ```pip install wheel```)
 
 Clone this repo as follows. 
@@ -40,9 +41,9 @@ This scripts build the following containers.
 - ```depa-training```: Container with the core CCR logic for joining datasets and running differentially private training. 
 - ```depa-training-encfs```: Container for loading encrypted data into the CCR. 
 
-Alternatively, you can use pre-built container images from the ```ispirt``` repository by setting the following environment variable. 
+Alternatively, you can use pre-built container images from the ispirt repository by setting the following environment variable. Docker hub has started throttling which may effect the upload/download time, especially when images are bigger size. So, It is advisable to use other container registries, we are using azure container registry as shown below
 ```bash
-export CONTAINER_REGISTRY=ispirt
+export CONTAINER_REGISTRY=ispirt.azurecr.io
 ```
 
 # Scenarios

scenarios/covid/README.md

@@ -93,11 +93,11 @@ We will be creating the following resources as part of the deployment.
 
 If you wish to use your own container images, login to docker hub and push containers to your container registry. 
 
-> **Note:** Replace `<docker-hub-registry-name>` the name of your docker hub registry name.
+> **Note:** Replace `<container-registry-name>` the name of your container registry name, preferably use registry services other than docker hub as throttling restrictions will cause delays (or) image push/pull failures
 
 ```bash
-export CONTAINER_REGISTRY=<docker-hub-registry-name>
-docker login 
+export CONTAINER_REGISTRY=<container-registry-name>
+docker login -u ${USERNAME} -p ${PASSWORD} ${CONTAINER_REGISTRY}
 ./ci/push-containers.sh
 cd scenarios/covid
 ./ci/push-containers.sh
@@ -130,7 +130,7 @@ cd scenarios/covid/data
 
 ### Sign and Register Contract
 
-Next, follow instructions [here](./../../external/contract-ledger/README.md) to sign and register a contract with the contract service. You can either deploy your own contract service or use a test contract service hosted at ```https://contract-service.westeurope.cloudapp.azure.com:8000```. The registered contract must contain references to the datasets with matching names, keyIDs and Azure Key Vault endpoints used in this sample. A sample contract template for this scenario is provided [here](./contract/contract.json). After updating, signing and registering the contract, retain the contract service URL and sequence number of the contract for the rest of this sample. 
+Next, follow instructions [here](https://github.com/kapilvgit/contract-ledger/blob/675003b83211e6d3d2c15864523bf875e0172cba/demo/contract/README.md) to sign and register a contract with the contract service. You can either deploy your own contract service or use a test contract service hosted at ```https://contract-service.eastus.cloudapp.azure.com:8000/```. The registered contract must contain references to the datasets with matching names, keyIDs and Azure Key Vault endpoints used in this sample. A sample contract template for this scenario is provided [here](./contract/contract.json). After updating, signing and registering the contract, retain the contract service URL and sequence number of the contract for the rest of this sample. 
 
 ### Import encryption keys
 
@@ -173,7 +173,7 @@ Acting as a TDC, use the following script to deploy the CCR using Confidential C
 
 ```bash
 cd scenarios/covid/deployment/aci
-./deploy.sh -c <contract-sequence-number> -m ../../config/model_config.json -q ../../config/query_config.json
+./deploy.sh -c <contract-sequence-number> -p ../../config/pipeline_config.json
 ```
 
 This script will deploy the container images from your container registry, including the encrypted filesystem sidecar. The sidecar will generate an SEV-SNP attestation report, generate an attestation token using the Microsoft Azure Attestation (MAA) service, retrieve dataset, model and output encryption keys from the TDP and TDC's Azure Key Vault, train the model, and save the resulting model into TDC's output filesystem image, which the TDC can later decrypt.