Skip to content

Commit 8ea5973

Browse files
authored
fix: set CLI_IMAGE var even if WASM_VM not set (#95)
1 parent 87e4393 commit 8ea5973

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
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.47.0
11+
pip install faasmctl==0.47.1
1212
```
1313

1414
## Usage

faasmctl/util/compose.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ def get_compose_env_vars(faasm_checkout, mount_source, ini_file=None):
119119

120120
if "FAASM_SGX_CLI_IMAGE" in environ and "sgx" in wasm_vm:
121121
env["FAASM_CLI_IMAGE"] = environ["FAASM_SGX_CLI_IMAGE"]
122+
else:
123+
# Even if no WASM_VM is set, pick the provided CLI image
124+
if "FAASM_CLI_IMAGE" in environ:
125+
env["FAASM_CLI_IMAGE"] = environ["FAASM_CLI_IMAGE"]
122126

123127
env["FAASM_OVERRIDE_CPU_COUNT"] = DEFAULT_FAASM_OVERRIDE_CPU_COUNT
124128
if "FAASM_OVERRIDE_CPU_COUNT" in environ:

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.47.0"
1+
FAASMCTL_VERSION = "0.47.1"
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.47.0"
7+
version = "0.47.1"
88
authors = [
99
{ name="Faasm Team", email="[email protected]" },
1010
]

0 commit comments

Comments
 (0)