From cd5cd90cc440508080f4f06e664efb27978002d9 Mon Sep 17 00:00:00 2001 From: Zhaochen Li Date: Tue, 15 Apr 2025 10:57:24 +1000 Subject: [PATCH 1/7] Update workspace default image to latest --- ee/lib/remote_development/settings/default_devfile.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/lib/remote_development/settings/default_devfile.yaml b/ee/lib/remote_development/settings/default_devfile.yaml index 7241d6850e12ec..744beabb5376ed 100644 --- a/ee/lib/remote_development/settings/default_devfile.yaml +++ b/ee/lib/remote_development/settings/default_devfile.yaml @@ -4,4 +4,4 @@ components: attributes: gl/inject-editor: true container: - image: "registry.gitlab.com/gitlab-org/gitlab-build-images/workspaces/ubuntu-24.04:20250321073701-golang-1.23-node-23.9-yarn-1.22-ruby-3.4.2-rust-1.85-docker-27.5.1@sha256:a059826e65f0bc0ee2f3fdfd62f16a108c5b99b24b4656734cd6b8f4631389ad" + image: "registry.gitlab.com/gitlab-org/gitlab-build-images/workspaces/ubuntu-24.04:20250414234733-golang-1.23-node-23.9-yarn-1.22-ruby-3.4.2-rust-1.85-php-8.4.5-java-21.0.6-python-3.13-docker-27.5.1@sha256:3b3fb1374084a20349019b88302fcc8ace1a3de5ab09465668d09f95a0eaa34b" -- GitLab From faa913a04fbf753c1d1ffd3088bf447eaf71276f Mon Sep 17 00:00:00 2001 From: Zhaochen Li Date: Tue, 15 Apr 2025 11:12:25 +1000 Subject: [PATCH 2/7] Update devfile devfile doc --- doc/user/workspace/_index.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/user/workspace/_index.md b/doc/user/workspace/_index.md index c5d20e6b79fb1f..dede70e11e3256 100644 --- a/doc/user/workspace/_index.md +++ b/doc/user/workspace/_index.md @@ -127,6 +127,8 @@ Workspaces support both GitLab default devfile and custom devfiles. {{< history >}} - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/171230) in GitLab 17.8. +- [Updated with Node, Ruby, Rust, etc](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/185393) in GitLab 17.9. +- [Updated with Python, Php, Jave, etc](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/188199) in GitLab 18.0. {{< /history >}} @@ -140,9 +142,18 @@ components: attributes: gl/inject-editor: true container: - image: "registry.gitlab.com/gitlab-org/gitlab-build-images/workspaces/ubuntu-24.04:20250321073701-golang-1.23-node-23.9-yarn-1.22-ruby-3.4.2-rust-1.85-docker-27.5.1@sha256:a059826e65f0bc0ee2f3fdfd62f16a108c5b99b24b4656734cd6b8f4631389ad" + image: "registry.gitlab.com/gitlab-org/gitlab-build-images/workspaces/ubuntu-24.04:[VERSION_TAG]" ``` +{{< alert type="note" >}} + +This container `image` is updated regularly. For the latest version, see the +[default_devfile YAML](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/lib/remote_development/settings/default_devfile.yaml) file. + +{{< /alert >}} + +The workspace default image includes the latest versions of development tools including Ruby, Node, Rust, Go, Python, Java, Php, Gcc and corrosponding package managers. + A GitLab default devfile might not be suitable for all development environments configurations. In these cases, you can create a [custom devfile](#custom-devfile). -- GitLab From 41dd6a38dd824853b3f28b9cffbda8fe16c471bc Mon Sep 17 00:00:00 2001 From: Zhaochen Li Date: Tue, 15 Apr 2025 17:49:28 +1000 Subject: [PATCH 3/7] Apply doc suggestions --- doc/user/workspace/_index.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/user/workspace/_index.md b/doc/user/workspace/_index.md index dede70e11e3256..a3a8d227d720ed 100644 --- a/doc/user/workspace/_index.md +++ b/doc/user/workspace/_index.md @@ -126,9 +126,9 @@ Workspaces support both GitLab default devfile and custom devfiles. {{< history >}} -- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/171230) in GitLab 17.8. -- [Updated with Node, Ruby, Rust, etc](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/185393) in GitLab 17.9. -- [Updated with Python, Php, Jave, etc](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/188199) in GitLab 18.0. +- [Introduced with Go](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/171230) in GitLab 17.8. +- [Added support for Node, Ruby, Rust](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/185393) in GitLab 17.9. +- [Added support for Python, PHP, Java, GCC](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/188199) in GitLab 18.0. {{< /history >}} @@ -152,7 +152,8 @@ This container `image` is updated regularly. For the latest version, see the {{< /alert >}} -The workspace default image includes the latest versions of development tools including Ruby, Node, Rust, Go, Python, Java, Php, Gcc and corrosponding package managers. +The workspace default image includes development tools such as Ruby, Node.js, Rust, Go, Python, +Java, PHP, GCC, and their corresponding package managers. These tools are updated regularly. A GitLab default devfile might not be suitable for all development environments configurations. In these cases, you can create a [custom devfile](#custom-devfile). -- GitLab From f54e4d43b1d3b1c9bcd9955735a09a419025f0b4 Mon Sep 17 00:00:00 2001 From: Zhaochen Li Date: Wed, 16 Apr 2025 09:27:45 +1000 Subject: [PATCH 4/7] Apply doc suggestions --- doc/user/workspace/_index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/user/workspace/_index.md b/doc/user/workspace/_index.md index a3a8d227d720ed..7c47eb84445146 100644 --- a/doc/user/workspace/_index.md +++ b/doc/user/workspace/_index.md @@ -127,8 +127,8 @@ Workspaces support both GitLab default devfile and custom devfiles. {{< history >}} - [Introduced with Go](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/171230) in GitLab 17.8. -- [Added support for Node, Ruby, Rust](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/185393) in GitLab 17.9. -- [Added support for Python, PHP, Java, GCC](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/188199) in GitLab 18.0. +- [Added support for Node, Ruby and Rust](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/185393) in GitLab 17.9. +- [Added support for Python, PHP, Java and GCC](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/188199) in GitLab 18.0. {{< /history >}} @@ -148,7 +148,7 @@ components: {{< alert type="note" >}} This container `image` is updated regularly. For the latest version, see the -[default_devfile YAML](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/lib/remote_development/settings/default_devfile.yaml) file. +[default_devfile.yaml](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/lib/remote_development/settings/default_devfile.yaml) file. {{< /alert >}} -- GitLab From cb61308e898ef75e47d492a557fb3cf2bb2728d6 Mon Sep 17 00:00:00 2001 From: Zhaochen Li Date: Wed, 16 Apr 2025 20:21:46 +1000 Subject: [PATCH 5/7] Apply doc suggestions --- doc/user/workspace/_index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/user/workspace/_index.md b/doc/user/workspace/_index.md index 7c47eb84445146..76c78deb9f1b21 100644 --- a/doc/user/workspace/_index.md +++ b/doc/user/workspace/_index.md @@ -127,8 +127,8 @@ Workspaces support both GitLab default devfile and custom devfiles. {{< history >}} - [Introduced with Go](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/171230) in GitLab 17.8. -- [Added support for Node, Ruby and Rust](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/185393) in GitLab 17.9. -- [Added support for Python, PHP, Java and GCC](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/188199) in GitLab 18.0. +- [Added support for Node, Ruby, and Rust](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/185393) in GitLab 17.9. +- [Added support for Python, PHP, Java, and GCC](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/188199) in GitLab 18.0. {{< /history >}} @@ -147,8 +147,8 @@ components: {{< alert type="note" >}} -This container `image` is updated regularly. For the latest version, see the -[default_devfile.yaml](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/lib/remote_development/settings/default_devfile.yaml) file. +This container `image` is updated regularly. `[VERSION_TAG]` is a placeholder only. For the latest version, see the +[default devfile](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/lib/remote_development/settings/default_devfile.yaml) file. {{< /alert >}} -- GitLab From 485570d623f3cf16623c8f43700afb6b4edab136 Mon Sep 17 00:00:00 2001 From: Zhaochen Li Date: Wed, 16 Apr 2025 23:11:06 +1000 Subject: [PATCH 6/7] Fix unit test --- .../remote_development/example.default_devfile.yaml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/spec/fixtures/remote_development/example.default_devfile.yaml.erb b/ee/spec/fixtures/remote_development/example.default_devfile.yaml.erb index 059e5f2df96b52..f1cc3b6c246cab 100644 --- a/ee/spec/fixtures/remote_development/example.default_devfile.yaml.erb +++ b/ee/spec/fixtures/remote_development/example.default_devfile.yaml.erb @@ -4,4 +4,4 @@ components: attributes: gl/inject-editor: true container: - image: "registry.gitlab.com/gitlab-org/gitlab-build-images/workspaces/ubuntu-24.04:20250321073701-golang-1.23-node-23.9-yarn-1.22-ruby-3.4.2-rust-1.85-docker-27.5.1@sha256:a059826e65f0bc0ee2f3fdfd62f16a108c5b99b24b4656734cd6b8f4631389ad" + image: "registry.gitlab.com/gitlab-org/gitlab-build-images/workspaces/ubuntu-24.04:20250321073701-golang-1.23-node-23.9-yarn-1.22-ruby-3.4.2-rust-1.85-docker-27.5.1@sha256:3b3fb1374084a20349019b88302fcc8ace1a3de5ab09465668d09f95a0eaa34b" -- GitLab From d71a6f4681820152a34395ac0299f52e71919256 Mon Sep 17 00:00:00 2001 From: Zhaochen Li Date: Thu, 17 Apr 2025 12:35:15 +1000 Subject: [PATCH 7/7] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Daniyal Arshad --- .../remote_development/example.default_devfile.yaml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/spec/fixtures/remote_development/example.default_devfile.yaml.erb b/ee/spec/fixtures/remote_development/example.default_devfile.yaml.erb index f1cc3b6c246cab..52765795d6161f 100644 --- a/ee/spec/fixtures/remote_development/example.default_devfile.yaml.erb +++ b/ee/spec/fixtures/remote_development/example.default_devfile.yaml.erb @@ -4,4 +4,4 @@ components: attributes: gl/inject-editor: true container: - image: "registry.gitlab.com/gitlab-org/gitlab-build-images/workspaces/ubuntu-24.04:20250321073701-golang-1.23-node-23.9-yarn-1.22-ruby-3.4.2-rust-1.85-docker-27.5.1@sha256:3b3fb1374084a20349019b88302fcc8ace1a3de5ab09465668d09f95a0eaa34b" + image: "registry.gitlab.com/gitlab-org/gitlab-build-images/workspaces/ubuntu-24.04:20250414234733-golang-1.23-node-23.9-yarn-1.22-ruby-3.4.2-rust-1.85-php-8.4.5-java-21.0.6-python-3.13-docker-27.5.1@sha256:3b3fb1374084a20349019b88302fcc8ace1a3de5ab09465668d09f95a0eaa34b" -- GitLab