diff options
| -rw-r--r-- | .github/workflows/test-all.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/test-pr.yaml | 2 | ||||
| -rw-r--r-- | src/common-utils/README.md (renamed from src/common/README.md) | 4 | ||||
| -rw-r--r-- | src/common-utils/devcontainer-feature.json (renamed from src/common/devcontainer-feature.json) | 4 | ||||
| -rwxr-xr-x | src/common-utils/install.sh (renamed from src/common/install.sh) | 0 | ||||
| -rw-r--r-- | test-scenarios/install_jupyterlab.sh | 4 | ||||
| -rw-r--r-- | test-scenarios/scenarios.json | 2 | ||||
| -rwxr-xr-x | test/common-utils/test.sh (renamed from test/common/test.sh) | 0 |
8 files changed, 11 insertions, 7 deletions
diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml index 04aa088..49d38d7 100644 --- a/.github/workflows/test-all.yaml +++ b/.github/workflows/test-all.yaml @@ -16,7 +16,7 @@ jobs: "anaconda", "aws-cli", "azure-cli", - "common", + "common-utils", "desktop-lite", "docker-from-docker", "docker-in-docker", diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml index b558eac..04108a7 100644 --- a/.github/workflows/test-pr.yaml +++ b/.github/workflows/test-pr.yaml @@ -16,7 +16,7 @@ jobs: anaconda: ./**/anaconda/** aws-cli: ./**/aws-cli/** azure-cli: ./**/azure-cli/** - common: ./**/common/** + common-utils: ./**/common-utils/** desktop-lite: ./**/desktop-lite/** docker-from-docker: ./**/docker-from-docker/** docker-in-docker: ./**/docker-in-docker/** diff --git a/src/common/README.md b/src/common-utils/README.md index b32cd45..d35e688 100644 --- a/src/common/README.md +++ b/src/common-utils/README.md @@ -1,5 +1,5 @@ -# Common Debian (common) +# Common Debian utilities (common-utils) Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user. @@ -7,7 +7,7 @@ Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-r ```json "features": { - "devcontainers/features/common@latest": { + "devcontainers/features/common-utils@latest": { "version": "latest" } } diff --git a/src/common/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json index 8cc6284..3eda5d3 100644 --- a/src/common/devcontainer-feature.json +++ b/src/common-utils/devcontainer-feature.json @@ -1,6 +1,6 @@ { - "id": "common", - "name": "Common Debian", + "id": "common-utils", + "name": "Common Debian Utilities", "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.", "options": { "install_Zsh": { diff --git a/src/common/install.sh b/src/common-utils/install.sh index 7edbe53..7edbe53 100755 --- a/src/common/install.sh +++ b/src/common-utils/install.sh diff --git a/test-scenarios/install_jupyterlab.sh b/test-scenarios/install_jupyterlab.sh index 2a4aaa3..9c5e453 100644 --- a/test-scenarios/install_jupyterlab.sh +++ b/test-scenarios/install_jupyterlab.sh @@ -8,5 +8,9 @@ source dev-container-features-test-lib check "version" jupyter lab --version check "config" grep ".*.allow_origin = '*'" /home/vscode/.jupyter/jupyter_notebook_config.py +check "user" whoami | grep vscode +check "zsh" zsh --version +check "wget" wget -V + # Report result reportResults diff --git a/test-scenarios/scenarios.json b/test-scenarios/scenarios.json index 20d802c..4ff49ed 100644 --- a/test-scenarios/scenarios.json +++ b/test-scenarios/scenarios.json @@ -31,7 +31,7 @@ "image": "mcr.microsoft.com/vscode/devcontainers/base:focal", "remoteUser": "vscode", "features": { - "common": { + "common-utils": { "username": "vscode" }, "python": { diff --git a/test/common/test.sh b/test/common-utils/test.sh index 1282015..1282015 100755 --- a/test/common/test.sh +++ b/test/common-utils/test.sh |