Skip to content

Commit 3ea0560

Browse files
authored
Merge pull request #557 from haitaohuang/fix_docker
Fix an error in docker/build
2 parents 0e71c22 + d340cef commit 3ea0560

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

docker/build/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ The sample scripts and Compose files are compatible with the Flexible Launch Con
5050
1. Replace "/dev/sgx/enclave" device with "/dev/isgx" and **remove** "/dev/sgx/provision" device for AESM in docker-compose.yml and build_and_run_aesm_docker.sh
5151
2. Replace "/dev/sgx/enclave" with "/dev/isgx" for the sample container in docker-compose.yml and build_and_run_sample_docker.sh
5252

53-
**Note**: When you switch between drivers, make sure you uninstall the previous driver and reset the OS before installing the other one.
53+
**Note**: When you switch between drivers, make sure you uninstall the previous driver and reboot the system before installing the other one.
5454

5555
**Note**: Earlier versions of the Flexible Launch Control driver and kernel patches may expose the SGX device as a single node at "/dev/sgx".

docker/build/build_and_run_aesm_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ chmod -R -f 777 /tmp/aesmd || sudo chmod -R -f 777 /tmp/aesmd || true
4444
# If you use the Legacy Launch Control driver, replace /dev/sgx/enclave with /dev/isgx, and remove
4545
# --device=/dev/sgx/provision
4646

47-
docker run --env http_proxy --env https_proxy --device=/dev/sgx --device=/dev/sgx/provision -v /dev/log:/dev/log -v /tmp/aesmd:/var/run/aesmd -it sgx_aesm
47+
docker run --env http_proxy --env https_proxy --device=/dev/sgx/enclave --device=/dev/sgx/provision -v /dev/log:/dev/log -v /tmp/aesmd:/var/run/aesmd -it sgx_aesm

linux/installer/docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The sample scripts and Compose files are compatible with the Flexible Launch Con
4646
1. Replace "/dev/sgx/enclave" device with "/dev/isgx" and **remove** "/dev/sgx/provision" device for AESM in docker-compose.yml and build_and_run_aesm_docker.sh
4747
2. Replace "/dev/sgx/enclave" with "/dev/isgx" for the sample container in docker-compose.yml and build_and_run_sample_docker.sh
4848

49-
**Note**: When you switch between drivers, make sure you uninstall the previous driver and reset the OS before installing the other one.
49+
**Note**: When you switch between drivers, make sure you uninstall the previous driver and reboot the system before installing the other one.
5050

5151
**Note**: Earlier versions of the Flexible Launch Control driver and kernel patches may expose the SGX device as a single node at "/dev/sgx".
5252

0 commit comments

Comments
 (0)