From 1a5de4ffb56d53e2182a24833cd7a57be99e42b4 Mon Sep 17 00:00:00 2001
From: Trig <7973740+Trigtrig@users.noreply.github.com>
Date: Tue, 27 Feb 2024 10:34:33 +0100
Subject: [PATCH 1/4] Added devcontainer.json

Added devcontainer.json
---
 .devcontainer.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .devcontainer.json

diff --git a/.devcontainer.json b/.devcontainer.json
new file mode 100644
index 0000000000000..995909edbf251
--- /dev/null
+++ b/.devcontainer.json
@@ -0,0 +1,8 @@
+{
+  "name": "selenium-devcontainer",
+  "build": {
+    "dockerfile": "./scripts/dev-image/Dockerfile"
+  },
+  "runArgs": ["--name", "selenium_devcontainer"],
+  "initializeCommand" : "echo 'Starting Selenium Devcontainer'"
+}

From 08d56f51e64a931a4c91159f2dcc910bc4c2883d Mon Sep 17 00:00:00 2001
From: Trig <7973740+Trigtrig@users.noreply.github.com>
Date: Wed, 28 Feb 2024 16:29:35 +0100
Subject: [PATCH 2/4] Moved file to devcontainer folder

Moved devcontainer.json to devcontainer folder
---
 .devcontainer.json              | 8 --------
 .devcontainer/devcontainer.json | 9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 .devcontainer.json
 create mode 100644 .devcontainer/devcontainer.json

diff --git a/.devcontainer.json b/.devcontainer.json
deleted file mode 100644
index 995909edbf251..0000000000000
--- a/.devcontainer.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "selenium-devcontainer",
-  "build": {
-    "dockerfile": "./scripts/dev-image/Dockerfile"
-  },
-  "runArgs": ["--name", "selenium_devcontainer"],
-  "initializeCommand" : "echo 'Starting Selenium Devcontainer'"
-}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000000..bb8385b3f354a
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,9 @@
+// https://containers.dev/implementors/json_reference/
+
+{
+  "name": "selenium-devcontainer",
+  "build": {
+    "dockerfile": "../scripts/dev-image/Dockerfile"
+  },
+  "runArgs": ["--name", "selenium_devcontainer"]
+}

From e63a2544aded7d9d20f88b839f2c1518d091c7a8 Mon Sep 17 00:00:00 2001
From: Trig <7973740+Trigtrig@users.noreply.github.com>
Date: Thu, 29 Feb 2024 09:23:17 +0100
Subject: [PATCH 3/4] Documented Dev Container setup in README

Section 'Using Docker Image' rephrased to include Dev Container setup documentation
---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6327ca2cfc12d..5614734be978f 100644
--- a/README.md
+++ b/README.md
@@ -101,11 +101,12 @@ Rather than creating your own local dev environment, GitPod provides a ready to
 
 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/SeleniumHQ/selenium)
 
-#### Using Docker Image
+#### Using Dev Container
 
-You can also build a Docker image suitable
-for building and testing Selenium using the Dockerfile in the
-[dev image](scripts/dev-image/Dockerfile) directory.
+You can also build a [Dev Container](https://containers.dev/) - basically a docker container - suitable
+for building and testing Selenium using the devcontainer.json in the
+[.devcontainer](.devcontainer/devcontainer.json) directory. Supporting IDEs like VS Code or IntelliJ IDEA
+should point you to how such a container can be created.
 
 
 ## Building

From 5ece14475d83a2b971fa071ce0719a5d4b727058 Mon Sep 17 00:00:00 2001
From: Trig <7973740+Trigtrig@users.noreply.github.com>
Date: Fri, 1 Mar 2024 08:42:41 +0100
Subject: [PATCH 4/4] Added back the original section 'Using Docker Image'

Dev Container section separated from Docker Image section
---
 README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5614734be978f..87c452a024e98 100644
--- a/README.md
+++ b/README.md
@@ -103,11 +103,16 @@ Rather than creating your own local dev environment, GitPod provides a ready to
 
 #### Using Dev Container
 
-You can also build a [Dev Container](https://containers.dev/) - basically a docker container - suitable
-for building and testing Selenium using the devcontainer.json in the
+As an alternative you can build a [Dev Container](https://containers.dev/) - basically a docker container -
+suitable for building and testing Selenium using the devcontainer.json in the
 [.devcontainer](.devcontainer/devcontainer.json) directory. Supporting IDEs like VS Code or IntelliJ IDEA
 should point you to how such a container can be created.
 
+#### Using Docker Image
+
+You can also build a Docker image suitable
+for building and testing Selenium using the Dockerfile in the
+[dev image](scripts/dev-image/Dockerfile) directory.
 
 ## Building