Skip to content

Commit 7171222

Browse files
Kaniska244Copilot
andauthored
[universal] - Update pinned toolings and removal of python libraries (#1611)
* [universal] - Update toolings * Restart test * Removing machine learning feature and small changes in setup-users feature * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Making changes in set-user script to save some space. * Removed commented lines. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 02fa3ab commit 7171222

File tree

4 files changed

+18
-34
lines changed

4 files changed

+18
-34
lines changed

src/universal/.devcontainer/devcontainer.json

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
"userGid": "1000"
1111
},
1212
"ghcr.io/devcontainers/features/dotnet:2": {
13-
"version": "8.0",
13+
"version": "10.0",
1414
"dotnetRuntimeVersions": "9.0",
1515
"aspNetCoreRuntimeVersions": "9.0"
1616
},
1717
"ghcr.io/devcontainers/features/hugo:1": {
1818
"version": "latest"
1919
},
2020
"ghcr.io/devcontainers/features/node:1": {
21-
"version": "22",
22-
"additionalVersions": "20"
21+
"version": "24",
22+
"additionalVersions": "22"
2323
},
2424
"./local-features/nvs": "latest",
2525
"ghcr.io/devcontainers/features/python:1": {
@@ -29,22 +29,21 @@
2929
"configureJupyterlabAllowOrigin": "*",
3030
"useOryxIfAvailable": "false"
3131
},
32-
"./local-features/machine-learning-packages": "latest",
3332
"ghcr.io/devcontainers/features/php:1": {
34-
"version": "8.4.2",
33+
"version": "8.4.8",
3534
"additionalVersions": "8.3.14",
3635
"installComposer": "true"
3736
},
3837
"ghcr.io/devcontainers/features/conda:1": {
3938
"version": "latest"
4039
},
4140
"ghcr.io/devcontainers/features/ruby:1": {
42-
"version": "3.4.1",
43-
"additionalVersions": "3.3.6"
41+
"version": "3.4.7",
42+
"additionalVersions": "3.3.10"
4443
},
4544
"ghcr.io/devcontainers/features/java:1": {
46-
"version": "21",
47-
"additionalVersions": "17",
45+
"version": "25",
46+
"additionalVersions": "21",
4847
"installGradle": "true",
4948
"installMaven": "true"
5049
},
@@ -73,7 +72,6 @@
7372
"./local-features/jekyll": "latest",
7473
"ghcr.io/devcontainers/features/oryx:1": "latest",
7574
"./local-features/setup-user": "latest",
76-
"./local-features/patch-python": {},
7775
"./local-features/patch-conda": {}
7876
},
7977
"overrideFeatureInstallOrder": [
@@ -86,8 +84,6 @@
8684
"ghcr.io/devcontainers/features/conda",
8785
"./local-features/patch-conda",
8886
"ghcr.io/devcontainers/features/python",
89-
"./local-features/patch-python",
90-
"./local-features/machine-learning-packages",
9187
"ghcr.io/devcontainers/features/php",
9288
"ghcr.io/devcontainers/features/ruby",
9389
"ghcr.io/devcontainers/features/java",

src/universal/.devcontainer/local-features/setup-user/install.sh

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,15 @@ mkdir -p /home/${USERNAME}/.hugo
8080
ln -snf /usr/local/hugo $HUGO_ROOT
8181

8282
HOME_DIR="/home/${USERNAME}/"
83-
chown -R ${USERNAME}:${USERNAME} ${HOME_DIR}
84-
chmod -R g+r+w "${HOME_DIR}"
85-
find "${HOME_DIR}" -type d | xargs -n 1 chmod g+s
83+
chown -R ${USERNAME}:${USERNAME} "${HOME_DIR}.php/"
84+
chmod -R g+r+w "${HOME_DIR}.php/"
85+
find "${HOME_DIR}.php/current/" -type d | xargs -n 1 chmod g+s
8686

87-
OPT_DIR="/opt/"
88-
chown -R ${USERNAME}:oryx ${OPT_DIR}
89-
chmod -R g+r+w "${OPT_DIR}"
90-
find "${OPT_DIR}" -type d | xargs -n 1 chmod g+s
87+
OPT_DOTNET_DIR="/opt/dotnet/"
88+
chown -R ${USERNAME}:oryx ${OPT_DOTNET_DIR}
89+
chmod -R g+r+w "${OPT_DOTNET_DIR}"
90+
find "${OPT_DOTNET_DIR}" -type d | xargs -n 1 chmod g+s
9191

9292
echo "Defaults secure_path=\"${DOTNET_PATH}:${NODE_PATH}/bin:${PHP_PATH}/bin:${PYTHON_PATH}/bin:${JAVA_PATH}/bin:${RUBY_PATH}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bin:/usr/local/share:/home/${USERNAME}/.local/bin:${PATH}\"" >> /etc/sudoers.d/$USERNAME
9393

94-
# Temporary: Due to GHSA-c2qf-rxjj-qqgw
95-
bash -c ". /usr/local/share/nvm/nvm.sh && nvm use 22"
96-
bash -c "npm -g install -g npm@9.8.1"
97-
bash -c ". /usr/local/share/nvm/nvm.sh && nvm use stable"
98-
9994
echo "Done!"

src/universal/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "4.1.1",
2+
"version": "5.0.0",
33
"build": {
44
"latest": true,
55
"rootDistro": "debian",

src/universal/test-project/test.sh

100644100755
Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ echo $(echo "python versions" && ls -a /usr/local/python)
4646
echo $(echo "pip list" pip list)
4747

4848
# Check Python packages
49-
check "numpy" python -c "import numpy; print(numpy.__version__)"
50-
check "pandas" python -c "import pandas; print(pandas.__version__)"
51-
check "scipy" python -c "import scipy; print(scipy.__version__)"
52-
check "matplotlib" python -c "import matplotlib; print(matplotlib.__version__)"
53-
check "seaborn" python -c "import seaborn; print(seaborn.__version__)"
54-
check "scikit-learn" python -c "import sklearn; print(sklearn.__version__)"
55-
check "torch" python -c "import torch; print(torch.__version__)"
5649
check "requests" python -c "import requests; print(requests.__version__)"
5750
check "jupyterlab-git" python -c "import jupyterlab_git; print(jupyterlab_git.__version__)"
5851

@@ -138,9 +131,9 @@ check "RAILS_DEVELOPMENT_HOSTS is set correctly" echo $RAILS_DEVELOPMENT_HOSTS |
138131
check "oryx" oryx --version
139132

140133
# Ensures nvm works in a Node Project
141-
check "default-node-version" bash -c "node --version | grep 22."
134+
check "default-node-version" bash -c "node --version | grep 24."
142135
check "default-node-location" bash -c "which node | grep /home/codespace/nvm/current/bin"
143-
check "oryx-build-node-projectr" bash -c "oryx build ./sample/node"
136+
check "oryx-build-node-project" bash -c "oryx build ./sample/node"
144137
check "oryx-configured-current-node-version" bash -c "ls -la /home/codespace/nvm/current | grep /opt/nodejs"
145138
check "nvm-install-node" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 8.0.0"
146139
check "nvm-works-in-node-project" bash -c "node --version | grep v8.0.0"

0 commit comments

Comments
 (0)