Skip to content

Commit 3d95b03

Browse files
shui1shui1
committed
Revert PSI changes to start_container.sh that started containers detached
1 parent 16e55f7 commit 3d95b03

File tree

3 files changed

+102
-40
lines changed

3 files changed

+102
-40
lines changed

‎cczoo/psi/README.md

Lines changed: 50 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,18 @@ images for developing the gRPC RA-TLS application.
7070
```
7171

7272
- Intel SGX Driver and SDK/PSW. You need a machine that supports Intel SGX and FLC/DCAP. Please follow this guide to install the Intel SGX driver and SDK/PSW on the machine/VM. Make sure to install the driver with ECDSA/DCAP attestation.
73-
For deployments on Microsoft Azure, a script is provided to install general dependencies, Intel SGX DCAP dependencies, and the Azure DCAP Client. To run this script:
73+
74+
For deployments on Microsoft Azure, a script is provided to install general dependencies, Intel SGX DCAP dependencies, and the Azure DCAP Client. To run this script:
7475

7576
```shell
7677
cd cczoo/psi
7778
./setup_azure_vm.sh
7879
```
79-
After Intel SGX DCAP is setup, verify the Intel Architectural Enclave Service Manager is active (running):
80+
After Intel SGX DCAP is setup, verify the Intel Architectural Enclave Service Manager is active (running):
8081

81-
```shell
82-
systemctl status aesmd
83-
```
82+
```shell
83+
systemctl status aesmd
84+
```
8485

8586
### Solution Ingredients
8687
This solution uses the following ingredients, which are installed as part of the container build process.
@@ -121,24 +122,54 @@ This example only shows an example of deploying PSI locally. If you want to depl
121122

122123
### Prepare the docker container
123124
Start four containers (one server, three clients).
124-
125-
For deployments on Microsoft Azure:
126-
```bash
127-
cd cczoo/psi
128-
./start_container.sh server
129-
./start_container.sh client1
130-
./start_container.sh client2
131-
./start_container.sh client3
132-
```
133-
For other cloud deployments:
134125
```bash
135126
cd cczoo/psi
136-
./start_container.sh server <pccs_service_ip>
137-
./start_container.sh client1 <pccs_service_ip>
138-
./start_container.sh client2 <pccs_service_ip>
139-
./start_container.sh client3 <pccs_service_ip>
140127
```
141128

129+
- For deployments on Microsoft Azure:
130+
131+
In terminal 1, start the server container:
132+
```bash
133+
./start_container.sh server
134+
```
135+
136+
In terminal 2, start the client1 container:
137+
```bash
138+
./start_container.sh client1
139+
```
140+
141+
In terminal 3, start the client2 container:
142+
```bash
143+
./start_container.sh client2
144+
```
145+
146+
In terminal 4, start the client3 container:
147+
```bash
148+
./start_container.sh client3
149+
```
150+
151+
- For other cloud deployments:
152+
153+
In terminal 1, start the server container:
154+
```bash
155+
./start_container.sh server <pccs_service_ip>
156+
```
157+
158+
In terminal 2, start the client1 container:
159+
```bash
160+
./start_container.sh client1 <pccs_service_ip>
161+
```
162+
163+
In terminal 3, start the client2 container:
164+
```bash
165+
./start_container.sh client2 <pccs_service_ip>
166+
```
167+
168+
In terminal 4, start the client3 container:
169+
```bash
170+
./start_container.sh client3 <pccs_service_ip>
171+
```
172+
142173
### Run the Python example
143174

144175
For each container (server, client1, client2, client3), build the Python example and note the mr_enclave value from the build output.

‎cczoo/psi/start_container.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fi
3838
no_proxy="localhost,127.0.0.1"
3939
# proxy_server="" # your http proxy server
4040
if [ ${image_tag} == "anolisos" ] ; then
41-
docker run -itd \
41+
docker run -it \
4242
--restart=unless-stopped \
4343
--cap-add=SYS_PTRACE \
4444
--security-opt seccomp=unconfined \
@@ -54,7 +54,7 @@ docker run -itd \
5454
${image_tag}_psi:latest \
5555
bash
5656
else
57-
docker run -itd \
57+
docker run -it \
5858
--restart=unless-stopped \
5959
--cap-add=SYS_PTRACE \
6060
--security-opt seccomp=unconfined \

‎documents/readthedoc/docs/source/Solutions/psi/PSI.md

Lines changed: 50 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,18 @@ images for developing the gRPC RA-TLS application.
7070
```
7171

7272
- Intel SGX Driver and SDK/PSW. You need a machine that supports Intel SGX and FLC/DCAP. Please follow this guide to install the Intel SGX driver and SDK/PSW on the machine/VM. Make sure to install the driver with ECDSA/DCAP attestation.
73-
For deployments on Microsoft Azure, a script is provided to install general dependencies, Intel SGX DCAP dependencies, and the Azure DCAP Client. To run this script:
73+
74+
For deployments on Microsoft Azure, a script is provided to install general dependencies, Intel SGX DCAP dependencies, and the Azure DCAP Client. To run this script:
7475

7576
```shell
7677
cd cczoo/psi
7778
./setup_azure_vm.sh
7879
```
79-
After Intel SGX DCAP is setup, verify the Intel Architectural Enclave Service Manager is active (running):
80+
After Intel SGX DCAP is setup, verify the Intel Architectural Enclave Service Manager is active (running):
8081

81-
```shell
82-
systemctl status aesmd
83-
```
82+
```shell
83+
systemctl status aesmd
84+
```
8485

8586
### Solution Ingredients
8687
This solution uses the following ingredients, which are installed as part of the container build process.
@@ -121,24 +122,54 @@ This example only shows an example of deploying PSI locally. If you want to depl
121122

122123
### Prepare the docker container
123124
Start four containers (one server, three clients).
124-
125-
For deployments on Microsoft Azure:
126-
```bash
127-
cd cczoo/psi
128-
./start_container.sh server
129-
./start_container.sh client1
130-
./start_container.sh client2
131-
./start_container.sh client3
132-
```
133-
For other cloud deployments:
134125
```bash
135126
cd cczoo/psi
136-
./start_container.sh server <pccs_service_ip>
137-
./start_container.sh client1 <pccs_service_ip>
138-
./start_container.sh client2 <pccs_service_ip>
139-
./start_container.sh client3 <pccs_service_ip>
140127
```
141128

129+
- For deployments on Microsoft Azure:
130+
131+
In terminal 1, start the server container:
132+
```bash
133+
./start_container.sh server
134+
```
135+
136+
In terminal 2, start the client1 container:
137+
```bash
138+
./start_container.sh client1
139+
```
140+
141+
In terminal 3, start the client2 container:
142+
```bash
143+
./start_container.sh client2
144+
```
145+
146+
In terminal 4, start the client3 container:
147+
```bash
148+
./start_container.sh client3
149+
```
150+
151+
- For other cloud deployments:
152+
153+
In terminal 1, start the server container:
154+
```bash
155+
./start_container.sh server <pccs_service_ip>
156+
```
157+
158+
In terminal 2, start the client1 container:
159+
```bash
160+
./start_container.sh client1 <pccs_service_ip>
161+
```
162+
163+
In terminal 3, start the client2 container:
164+
```bash
165+
./start_container.sh client2 <pccs_service_ip>
166+
```
167+
168+
In terminal 4, start the client3 container:
169+
```bash
170+
./start_container.sh client3 <pccs_service_ip>
171+
```
172+
142173
### Run the Python example
143174

144175
For each container (server, client1, client2, client3), build the Python example and note the mr_enclave value from the build output.

0 commit comments

Comments
 (0)