Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(docker): install the correct starwhale version when startup #1607

Merged
merged 1 commit into from
Dec 13, 2022
Merged

chore(docker): install the correct starwhale version when startup #1607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions client/scripts/sw-docker-entrypoint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,29 @@ set_pip_cache() {
python3 -m pip cache dir || true
}

set_python() {
_MANIFEST_RUNTIME=$(swcli -o json runtime info ${SW_RUNTIME_VERSION} | jq -r '.config["environment"]["python"]') || exit 1
set_py_and_sw() {
_MANIFEST_RUNTIME=$(swcli -o json runtime info ${SW_RUNTIME_VERSION} | jq -r ".config.environment.python") || exit 1
_RUNTIME="python${_MANIFEST_RUNTIME}"

echo "**** DETECT RUNTIME: ${_RUNTIME}"
ORIGIN_SW_VER=$(swcli --version)
DETECTED_SW_VER=$(swcli -o json runtime info ${SW_RUNTIME_VERSION} | jq -r ".config.environment.lock.starwhale_version") || exit 1
DETECTED_SW_VER=${DETECTED_SW_VER:-$ORIGIN_SW_VER}

echo "**** DETECT RUNTIME: python version: ${_RUNTIME}, starwhale version: ${DETECTED_SW_VER}"

# default python version
PY_VER="python3.8"
if [ "$_RUNTIME" = "python3.7" ] || [ "$_RUNTIME" = "python3.9" ] || [ "$_RUNTIME" = "python3.10" ] ; then
_update_python_alter "$_RUNTIME"
else
_update_python_alter "python3.8"
PY_VER="$_RUNTIME"
fi
_update_python_alter "$PY_VER"

if [ "$PY_VER" != "$_RUNTIME" ] || [ "$DETECTED_SW_VER" != "$ORIGIN_SW_VER" ]; then
# ignore the editable dev version
if [ "$DETECTED_SW_VER" != "0.0.0.dev0" ]; then
# install starwhale for current python
python3 -m pip install "starwhale==${DETECTED_SW_VER}" || exit 1
fi
fi
}

Expand Down Expand Up @@ -109,7 +122,7 @@ eval_task_prepare(){
# only remote
pull_model_and_runtime
fi
set_python
set_py_and_sw
set_pip_cache
}

Expand Down
2 changes: 1 addition & 1 deletion client/starwhale/cli/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

def create_sw_cli() -> click.core.Group:
@click.group(cls=AliasedGroup)
@click.version_option(version=STARWHALE_VERSION)
@click.version_option(version=STARWHALE_VERSION, message="%(version)s")
@click.option(
"-v",
"--verbose",
Expand Down