Skip to content

Commit 0329c1d

Browse files
Universal: Update versions of languages/SDKs (devcontainers#267)
* Universal: Update versions for languages * php - add three part * remove node v14 patches * revert python changes: not supported by oryx * fix tests * Node - 19 & 18
1 parent b63ed29 commit 0329c1d

File tree

3 files changed

+5
-102
lines changed

3 files changed

+5
-102
lines changed

src/universal/.devcontainer/devcontainer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"version": "latest"
1919
},
2020
"ghcr.io/devcontainers/features/node:1": {
21-
"version": "16",
22-
"additionalVersions": "14"
21+
"version": "19",
22+
"additionalVersions": "18"
2323
},
2424
"./local-features/nvs": "latest",
2525
"ghcr.io/devcontainers/features/python:1": {
@@ -30,8 +30,8 @@
3030
},
3131
"./local-features/machine-learning-packages": "latest",
3232
"ghcr.io/devcontainers/features/php:1": {
33-
"version": "8.1.4",
34-
"additionalVersions": "8.0.16",
33+
"version": "8.2.1",
34+
"additionalVersions": "8.1.14",
3535
"installComposer": "true"
3636
},
3737
"ghcr.io/devcontainers/features/conda:1": {

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

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -57,51 +57,6 @@ curl -sSL https://github.com/apache/commons-io/archive/refs/tags/commons-io-2.11
5757
jar cf ${MAVEN_PATH}/commons-io-2.11.jar /tmp/commons-io-commons-io-2.11.0-RC1
5858
rm -rf /tmp/commons-io-commons-io-2.11.0-RC1
5959

60-
# Temporary: Upgrade NPM packages due to mentioned CVEs.
61-
# ansi-regex: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3807
62-
# decode-uri-component: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-38900
63-
# diff: https://github.com/advisories/GHSA-h6ch-v84p-w6p9
64-
# got: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-33987
65-
# minimatch: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-3517
66-
# qs: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24999
67-
NPM_PACKAGES_LIST="ansi-regex
68-
decode-uri-component
69-
diff
70-
got
71-
minimatch
72-
qs"
73-
74-
cd /usr/local/share/nvm/versions/node/v14*/lib/node_modules/npm
75-
npm install ${NPM_PACKAGES_LIST}
76-
77-
# Temporary: ajv: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-15366
78-
npm install ajv@8.11.2
79-
80-
cd /usr/local/share/nvm/versions/node/v14*/lib/node_modules/npm/node_modules/eslint
81-
npm install ajv@8.11.2
82-
83-
# Temporary: marked: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-21680
84-
npm install marked-man@1.3.1
85-
npm install marked@4.2.5
86-
87-
# Temporary: ansi-regex: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3807
88-
cd /usr/local/share/nvm/versions/node/v14*/lib/node_modules/npm/node_modules/string-width
89-
npm install ansi-regex --save
90-
91-
cd /usr/local/share/nvm/versions/node/v14*/lib/node_modules/npm/node_modules/yargs
92-
npm install ansi-regex --save
93-
94-
# Temporary due to minimist: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44906 & https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-7598
95-
cd /usr/local/share/nvm/versions/node/v14*/lib/node_modules/npm/node_modules/tacks
96-
npm update mkdirp
97-
98-
# Temporary due to diff: https://github.com/advisories/GHSA-h6ch-v84p-w6p9
99-
npm install diff
100-
101-
# Temporary: got: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-33987
102-
cd /usr/local/share/nvm/versions/node/v14*/lib/node_modules/npm/node_modules/package-json/
103-
npm install got@12.5.3
104-
10560
# Temporary: Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0536 & https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0155
10661
rm -rf /usr/local/nvs/deps/node_modules/follow-redirects/*
10762
curl -sSL https://github.com/follow-redirects/follow-redirects/archive/refs/tags/v1.15.2.tar.gz | tar -xzC /tmp 2>&1

src/universal/test-project/test.sh

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ check "run-puppeteer" node puppeteer.js
129129
check "oryx" oryx --version
130130

131131
# Ensures nvm works in a Node Project
132-
check "default-node-version" bash -c "node --version | grep 16."
132+
check "default-node-version" bash -c "node --version | grep 19."
133133
check "default-node-location" bash -c "which node | grep /home/codespace/nvm/current/bin"
134134
check "oryx-build-node-projectr" bash -c "oryx build ./sample/node"
135135
check "oryx-configured-current-node-version" bash -c "ls -la /home/codespace/nvm/current | grep /opt/nodejs"
@@ -180,58 +180,6 @@ check "testng-plugin" bash -c "ls ${GRADLE_PATH} | grep testng-7.7.0.jar"
180180
MAVEN_PATH=$(cd /usr/local/sdkman/candidates/maven/3*/lib/ && pwd)
181181
check "commons-io-lib" bash -c "ls ${MAVEN_PATH} | grep commons-io-2.11.jar"
182182

183-
cd /usr/local/share/nvm/versions/node/v14*/lib/node_modules/npm
184-
185-
decodeVersion=$(npm ls --depth 1 --json | jq -r '.dependencies."decode-uri-component".version')
186-
check-version-ge "decode-uri-component" "${decodeVersion}" "0.2.1"
187-
188-
ansiVersion=$(npm ls --depth 1 --json | jq -r '.dependencies."ansi-regex".version')
189-
check-version-ge "ansi-regex" "${ansiVersion}" "6.0.1"
190-
191-
minimatchVersion=$(npm ls --depth 1 --json | jq -r '.dependencies.minimatch.version')
192-
check-version-ge "minimatch" "${minimatchVersion}" "3.0.5"
193-
194-
gotVersion=$(npm ls --depth 1 --json | jq -r '.dependencies.got.version')
195-
check-version-ge "got" "${gotVersion}" "12.1.0"
196-
197-
ajvVersion=$(npm ls --depth 1 --json | jq -r '.dependencies.ajv.version')
198-
check-version-ge "ajv" "${ajvVersion}" "6.12.3"
199-
200-
markedVersion=$(npm ls --depth 1 --json | jq -r '.dependencies.marked.version')
201-
check-version-ge "marked" "${markedVersion}" "4.0.10"
202-
203-
qsVersion=$(npm ls --depth 1 --json | jq -r '.dependencies.qs.version')
204-
check-version-ge "qs" "${qsVersion}" "6.10"
205-
206-
diffVersion=$(npm ls --depth 1 --json | jq -r '.dependencies.diff.version')
207-
check-version-ge "diff" "${diffVersion}" "3.5"
208-
209-
cd /usr/local/share/nvm/versions/node/v14*/lib/node_modules/npm/node_modules/package-json/
210-
211-
gotVersion=$(npm ls --depth 1 --json | jq -r '.dependencies.got.version')
212-
check-version-ge "got" "${gotVersion}" "12.1.0"
213-
214-
cd /usr/local/share/nvm/versions/node/v14*/lib/node_modules/npm/node_modules/string-width
215-
216-
ansiVersion=$(npm ls --depth 1 --json | jq -r '.dependencies."ansi-regex".version')
217-
check-version-ge "ansi-regex-2" "${ansiVersion}" "6.0.1"
218-
219-
cd /usr/local/share/nvm/versions/node/v14*/lib/node_modules/npm/node_modules/tacks
220-
221-
minimistVersion=$(npm ls --depth 1 --json | jq -r '.dependencies.mkdirp.dependencies.minimist.version')
222-
check-version-ge "minimist" "${minimistVersion}" "1.2.6"
223-
224-
diffVersion=$(npm ls --depth 1 --json | jq -r '.dependencies.diff.version')
225-
check-version-ge "diff-2" "${diffVersion}" "3.5"
226-
227-
cd /usr/local/share/nvm/versions/node/v14*/lib/node_modules/npm/node_modules/eslint
228-
229-
ajvVersion=$(npm ls --depth 1 --json | jq -r '.dependencies.ajv.version')
230-
check-version-ge "ajv-2" "${ajvVersion}" "6.12.3"
231-
232-
cd /usr/local/share/nvm/versions/node/v14*/lib/node_modules/npm/node_modules/yargs
233-
ansiVersion=$(npm ls --depth 1 --json | jq -r '.dependencies."ansi-regex".version')
234-
check-version-ge "ansi-regex-3" "${ansiVersion}" "6.0.1"
235183

236184
ls -la /home/codespace
237185

0 commit comments

Comments
 (0)