Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions src/renku/devcontainer-feature.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
"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/rocker-org/devcontainer-features/miniforge:1": {},
"ghcr.io/devcontainers/features/git:1": {},
"ghcr.io/devcontainers/features/git-lfs:1": {
Expand Down
12 changes: 2 additions & 10 deletions src/renku/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -23,7 +15,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 -s -- -t nightly

chown -R ${USERNAME} /usr/local/py-utils
2 changes: 1 addition & 1 deletion test/renku/renku-base-notebook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
Expand Down
2 changes: 1 addition & 1 deletion test/renku/renku-ubuntu-jovyan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
Expand Down
2 changes: 1 addition & 1 deletion test/renku/renku-ubuntu-randomUser.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
Expand Down
2 changes: 1 addition & 1 deletion test/renku/renku.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 2> >(grep 'This is the 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.
Expand Down
2 changes: 1 addition & 1 deletion test/renku/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <LABEL> <cmd> [args...]
check "renku is installed" bash -c "renku | grep 'Check common Renku commands'"
check "renku is installed" bash -c "rnk 2> >(grep 'This is the command line interface to the Renku platform')"
check "git-lfs is installed" bash -c "git lfs | grep 'git lfs <command>'"
check "conda is available" bash -c "conda --version"
check "/opt/conda/bin is on PATH" bash -c "grep -q '/opt/conda/bin' <<< '$PATH'"
Expand Down