Skip to content

Commit 8812619

Browse files
authored
sgx: only start aesmd socket in hw mode, not simulation (#93)
1 parent beb9d65 commit 8812619

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ running [Faasm](https://github.com/faasm/faasm) cluster.
88
To install `faasmctl` you need a working `pip` (virtual-)environment. Then:
99

1010
```bash
11-
pip install faasmctl==0.46.1
11+
pip install faasmctl==0.46.2
1212
```
1313

1414
## Usage

faasmctl/util/compose.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,12 @@ def deploy_compose_cluster(faasm_checkout, workers, mount_source, ini_file):
155155
# In a compose cluster with SGX in HW mode, we need to manually set-up
156156
# the AESMD volume and socket for remote attestation (in a k8s deployment
157157
# on AKS, this is done automatically for us)
158-
must_start_sgx_aesmd = "FAASM_WASM_VM" in env and env["FAASM_WASM_VM"] == "sgx"
158+
is_sgx_deployment = "FAASM_WASM_VM" in env and env["FAASM_WASM_VM"] == "sgx"
159+
is_hw_mode = (
160+
"FAASM_WORKER_IMAGE" in env
161+
and "worker-sgx-sim" not in env["FAASM_WORKER_IMAGE"]
162+
)
163+
must_start_sgx_aesmd = is_sgx_deployment and is_hw_mode
159164

160165
if must_start_sgx_aesmd:
161166
docker_cmd = [

faasmctl/util/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FAASMCTL_VERSION = "0.46.1"
1+
FAASMCTL_VERSION = "0.46.2"
22

33

44
def get_version():

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "faasmctl"
7-
version = "0.46.1"
7+
version = "0.46.2"
88
authors = [
99
{ name="Faasm Team", email="[email protected]" },
1010
]

0 commit comments

Comments
 (0)