From 6b27f00d05fd742607b8b315e1fd3f15fa58d845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rok=20Ro=C5=A1kar?= Date: Tue, 20 Aug 2024 15:58:06 +0200 Subject: [PATCH 1/6] chore: use the new cli --- src/renku/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renku/install.sh b/src/renku/install.sh index b2beee2..00a94b1 100644 --- a/src/renku/install.sh +++ b/src/renku/install.sh @@ -23,7 +23,7 @@ if [ "${INSTALLJUPYTER}" = "true" ]; then ln -sf /opt/conda/bin/jupyter-server /opt/conda/bin/jupyter-notebook fi -pip install pipx -pipx install renku==${VERSION} +# install the renku CLI +curl -sfSL https://raw.githubusercontent.com/SwissDataScienceCenter/renku-cli/main/install.sh | bash chown -R ${USERNAME} /usr/local/py-utils From 97c6f263afcad73484eb06b0e16eb1625fff1432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rok=20Ro=C5=A1kar?= Date: Tue, 20 Aug 2024 16:00:21 +0200 Subject: [PATCH 2/6] chore: remove weird characters --- src/renku/devcontainer-feature.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renku/devcontainer-feature.json b/src/renku/devcontainer-feature.json index 9f57784..c0324ae 100644 --- a/src/renku/devcontainer-feature.json +++ b/src/renku/devcontainer-feature.json @@ -29,8 +29,8 @@ "ghcr.io/rocker-org/devcontainer-features/apt-packages:1": { "packages": "build-essential,bzip2,ca-certificates,curl,gpg-agent,gnupg,libglib2.0-0,libsm6,libxext6,libxrender1,rclone,tini,wget,vim,jq" }, - "ghcr.io/devcontainers/features/python:1": { │ - "version": "3.10" │ + "ghcr.io/devcontainers/features/python:1": { + "version": "3.10" }, "ghcr.io/rocker-org/devcontainer-features/miniforge:1": {}, "ghcr.io/devcontainers/features/git:1": {}, From e83173566b286e5c41e5148147a4cf0aeb946caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rok=20Ro=C5=A1kar?= Date: Tue, 20 Aug 2024 16:15:18 +0200 Subject: [PATCH 3/6] chore: install nightly build --- src/renku/install.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/renku/install.sh b/src/renku/install.sh index 00a94b1..5ea1466 100644 --- a/src/renku/install.sh +++ b/src/renku/install.sh @@ -4,14 +4,6 @@ set -ex USER_ID=1000 USERNAME=${USERNAME:-${_REMOTE_USER}} -echo "Activating feature Renku" - -VERSION=${VERSION:-"latest"} -if [ "${VERSION}" = "latest" ]; then - VERSION=$(curl -s https://pypi.org/pypi/renku/json | jq '.releases | keys | sort | .[]' | grep -oP "\"[0-9]+\.[0-9]+\.[0-9]\"" | tr -d '"' | sort -rV | head -n 1) -fi -echo "The requested version is: $VERSION" - # create the user if missing if ! id -u "${USERNAME}" >/dev/null 2>&1 && [ "$CREATEUSER" = "true" ]; then useradd -l -m -s /bin/bash -N -u 1000 "${USERNAME}" @@ -24,6 +16,6 @@ if [ "${INSTALLJUPYTER}" = "true" ]; then fi # install the renku CLI -curl -sfSL https://raw.githubusercontent.com/SwissDataScienceCenter/renku-cli/main/install.sh | bash +curl -sfSL https://raw.githubusercontent.com/SwissDataScienceCenter/renku-cli/main/install.sh | bash -s -- -t nightly chown -R ${USERNAME} /usr/local/py-utils From 7f2fed9984c0d2542d731d9236edbc798674ba7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rok=20Ro=C5=A1kar?= Date: Tue, 20 Aug 2024 16:21:38 +0200 Subject: [PATCH 4/6] chore: adapt test for rnk --- test/renku/renku-base-notebook.sh | 2 +- test/renku/renku-ubuntu-jovyan.sh | 2 +- test/renku/renku-ubuntu-randomUser.sh | 2 +- test/renku/renku.sh | 2 +- test/renku/test.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/renku/renku-base-notebook.sh b/test/renku/renku-base-notebook.sh index 026f5ec..a63df06 100644 --- a/test/renku/renku-base-notebook.sh +++ b/test/renku/renku-base-notebook.sh @@ -7,7 +7,7 @@ source dev-container-features-test-lib # Feature-specific tests # The 'check' command comes from the dev-container-features-test-lib. -check "renku is available" bash -c "renku --help" +check "renku is available" bash -c "rnk --help" check "git-lfs is available" bash -c "git lfs --help" check "conda is available" bash -c "conda --version" check "/opt/conda/bin is on PATH" bash -c "grep -q '/opt/conda/bin' <<< '$PATH'" diff --git a/test/renku/renku-ubuntu-jovyan.sh b/test/renku/renku-ubuntu-jovyan.sh index 026f5ec..a63df06 100644 --- a/test/renku/renku-ubuntu-jovyan.sh +++ b/test/renku/renku-ubuntu-jovyan.sh @@ -7,7 +7,7 @@ source dev-container-features-test-lib # Feature-specific tests # The 'check' command comes from the dev-container-features-test-lib. -check "renku is available" bash -c "renku --help" +check "renku is available" bash -c "rnk --help" check "git-lfs is available" bash -c "git lfs --help" check "conda is available" bash -c "conda --version" check "/opt/conda/bin is on PATH" bash -c "grep -q '/opt/conda/bin' <<< '$PATH'" diff --git a/test/renku/renku-ubuntu-randomUser.sh b/test/renku/renku-ubuntu-randomUser.sh index 1fb57b5..b456ccb 100644 --- a/test/renku/renku-ubuntu-randomUser.sh +++ b/test/renku/renku-ubuntu-randomUser.sh @@ -7,7 +7,7 @@ source dev-container-features-test-lib # Feature-specific tests # The 'check' command comes from the dev-container-features-test-lib. -check "renku is available" bash -c "renku --help" +check "renku is available" bash -c "rnk --help" check "git-lfs is available" bash -c "git lfs --help" check "conda is available" bash -c "conda --version" check "/opt/conda/bin is on PATH" bash -c "grep -q '/opt/conda/bin' <<< '$PATH'" diff --git a/test/renku/renku.sh b/test/renku/renku.sh index 950574e..8c9db55 100644 --- a/test/renku/renku.sh +++ b/test/renku/renku.sh @@ -7,7 +7,7 @@ source dev-container-features-test-lib # Feature-specific tests # The 'check' command comes from the dev-container-features-test-lib. -check "renku is installed" bash -c "renku | grep 'Check common Renku commands'" +check "renku is installed" bash -c "rnk | grep 'command line interface to the Renku platform'" # Report results # If any of the checks above exited with a non-zero exit code, the test will fail. diff --git a/test/renku/test.sh b/test/renku/test.sh index 6ef4225..a511bd5 100644 --- a/test/renku/test.sh +++ b/test/renku/test.sh @@ -10,7 +10,7 @@ source dev-container-features-test-lib # Feature-specific tests # The 'check' command comes from the dev-container-features-test-lib. Syntax is... # check