Skip to content

Commit b626460

Browse files
CopilotKaniska244
andauthored
Remove EOL Ruby 3.2 variants, update universal image to v6, and fix Oryx v2 tests (#419)
* Initial plan * Fix Check Image Tags (Last Release) CI: remove Ruby 3.2 EOL variants, update universal to v6 Agent-Logs-Url: https://github.com/devcontainers/templates/sessions/13a16d95-5ae0-465f-a553-f5dfb0da38b0 Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com> * Bump patch versions: ruby 6.0.1, ruby-rails-postgres 6.0.1, universal 2.0.1 Agent-Logs-Url: https://github.com/devcontainers/templates/sessions/532ce715-1dcb-40fa-a9f8-5c97a93639ea Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com> * Update universal test script for Oryx v2: bump dotnet/nodejs/php versions, remove Java tests Agent-Logs-Url: https://github.com/devcontainers/templates/sessions/32adc107-6a26-4fc1-a18e-1a8ef81e33c5 Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
1 parent c1ca13c commit b626460

5 files changed

Lines changed: 15 additions & 25 deletions

File tree

src/ruby-rails-postgres/devcontainer-template.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "ruby-rails-postgres",
3-
"version": "6.0.0",
3+
"version": "6.0.1",
44
"name": "Ruby on Rails & Postgres",
55
"description": "Develop Ruby on Rails applications with Postgres. Includes a Rails application container and PostgreSQL server.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/ruby-rails-postgres",
@@ -14,14 +14,11 @@
1414
"4-trixie",
1515
"3.4-trixie",
1616
"3.3-trixie",
17-
"3.2-trixie",
1817
"4-bookworm",
1918
"3.4-bookworm",
2019
"3.3-bookworm",
21-
"3.2-bookworm",
2220
"3.4-bullseye",
23-
"3.3-bullseye",
24-
"3.2-bullseye"
21+
"3.3-bullseye"
2522
],
2623
"default": "4-trixie"
2724
}

src/ruby/devcontainer-template.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "ruby",
3-
"version": "6.0.0",
3+
"version": "6.0.1",
44
"name": "Ruby",
55
"description": "Develop Ruby based applications. includes everything you need to get up and running.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/ruby",
@@ -14,14 +14,11 @@
1414
"4-trixie",
1515
"3.4-trixie",
1616
"3.3-trixie",
17-
"3.2-trixie",
1817
"4-bookworm",
1918
"3.4-bookworm",
2019
"3.3-bookworm",
21-
"3.2-bookworm",
2220
"3.4-bullseye",
23-
"3.3-bullseye",
24-
"3.2-bullseye"
21+
"3.3-bullseye"
2522
],
2623
"default": "4-trixie"
2724
}

src/universal/.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Default Linux Universal",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/universal:5-linux"
6+
"image": "mcr.microsoft.com/devcontainers/universal:6-linux"
77

88
// Features to add to the dev container. More info: https://containers.dev/features.
99
// "features": {},

src/universal/devcontainer-template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "universal",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"name": "Default Linux Universal",
55
"description": "Use or extend the new Ubuntu-based default, large, multi-language universal container for GitHub Codespaces.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/universal",

test/universal/test.sh

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,21 +113,17 @@ check "RAILS_DEVELOPMENT_HOSTS is set correctly" echo $RAILS_DEVELOPMENT_HOSTS |
113113
check "oryx" oryx --version
114114

115115
# Install platforms with oryx build tool
116-
check "oryx-install-dotnet-2.1" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
117-
check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 2.1
118-
check "dotnet-version-on-path-is-2.1.12" dotnet --version | grep 2.1
116+
check "oryx-install-dotnet-8.0" oryx prep --skip-detection --platforms-and-versions dotnet=8.0.23
117+
check "dotnet-8-installed-by-oryx" ls /opt/dotnet/ | grep 8.0
118+
check "dotnet-version-on-path-is-8.0.23" dotnet --version | grep 8.0.23
119119

120-
check "oryx-install-nodejs-12.22.11" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
121-
check "nodejs-12.22.11-installed-by-oryx" ls /opt/nodejs/ | grep 12.22.11
122-
check "nodejs-version-on-path-is-2.1.12" node --version | grep v12.22.11
120+
check "oryx-install-nodejs-20.11.0" oryx prep --skip-detection --platforms-and-versions nodejs=20.11.0
121+
check "nodejs-20.11.0-installed-by-oryx" ls /opt/nodejs/ | grep 20.11.0
122+
check "nodejs-version-on-path-is-20.11.0" node --version | grep v20.11.0
123123

124-
check "oryx-install-php-7.3.25" oryx prep --skip-detection --platforms-and-versions php=7.3.25
125-
check "php-7.3.25-installed-by-oryx" ls /opt/php/ | grep 7.3.25
126-
check "php-version-on-path-is-2.1.12" php --version | grep 7.3.25
127-
128-
check "oryx-install-java-12.0.2" oryx prep --skip-detection --platforms-and-versions java=12.0.2
129-
check "java-12.0.2-installed-by-oryx" ls /opt/java/ | grep 12.0.2
130-
check "java-version-on-path-is-12.0.2" java --version | grep 12.0.2
124+
check "oryx-install-php-8.1.30" oryx prep --skip-detection --platforms-and-versions php=8.1.30
125+
check "php-8.1.30-installed-by-oryx" ls /opt/php/ | grep 8.1.30
126+
check "php-version-on-path-is-8.1.30" php --version | grep 8.1.30
131127

132128
ls -la /home/codespace
133129

0 commit comments

Comments
 (0)