From a5d04861721c3568556136f09dd4bf8934d42b6d Mon Sep 17 00:00:00 2001
From: Shubhada <shpaitha@redhat.com>
Date: Thu, 3 Oct 2024 17:15:52 -0700
Subject: [PATCH 1/5] Selenium Service Migration to Docker Compose

---
 Makefile           |  8 ++++++++
 docker-compose.yml | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/Makefile b/Makefile
index 36c95bff746..04fe9df91fa 100644
--- a/Makefile
+++ b/Makefile
@@ -445,3 +445,11 @@ run-portal:
 run-rp: aks.kubeconfig
 	docker compose rm -sf rp
 	docker compose up rp
+
+.PHONY: build-selenium
+build selenium:
+	docker compose build selenium
+
+.PHONY: run selenium
+run selenium:
+	docker-compose up selenium
diff --git a/docker-compose.yml b/docker-compose.yml
index 7d88a092198..87314172749 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -152,3 +152,13 @@ secrets:
     file: ./secrets/proxy.crt
   hive-kubeconfig:
     file: ./aks.kubeconfig
+services:
+  selenium:
+    image: selenium/standalone-chrome
+    container_name: selenium-container
+    network_mode: host
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:4444"]
+      interval: 30s
+      timeout: 10s
+      retries: 3

From c06f14d3a5e3786938ebff36833df1821e767c4a Mon Sep 17 00:00:00 2001
From: Shubhada <shpaitha@redhat.com>
Date: Mon, 7 Oct 2024 13:22:35 -0700
Subject: [PATCH 2/5] Improved the consistency and readability of your code.

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 04fe9df91fa..f85097446cb 100644
--- a/Makefile
+++ b/Makefile
@@ -447,9 +447,9 @@ run-rp: aks.kubeconfig
 	docker compose up rp
 
 .PHONY: build-selenium
-build selenium:
+build-selenium:
 	docker compose build selenium
 
-.PHONY: run selenium
-run selenium:
-	docker-compose up selenium
+.PHONY: run-selenium
+run-selenium:
+	docker compose up selenium

From f27786cca36d500e1aa38fa249b2e117f56d61dd Mon Sep 17 00:00:00 2001
From: Shubhada <shpaitha@redhat.com>
Date: Wed, 9 Oct 2024 09:24:51 -0700
Subject: [PATCH 3/5] Remove unused build target, switch to standalone-chrome,
 and update scripts for consistency

---
 Makefile           | 4 ----
 docker-compose.yml | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index f85097446cb..a99bd9f0396 100644
--- a/Makefile
+++ b/Makefile
@@ -446,10 +446,6 @@ run-rp: aks.kubeconfig
 	docker compose rm -sf rp
 	docker compose up rp
 
-.PHONY: build-selenium
-build-selenium:
-	docker compose build selenium
-
 .PHONY: run-selenium
 run-selenium:
 	docker compose up selenium
diff --git a/docker-compose.yml b/docker-compose.yml
index 87314172749..a5df7bc9398 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -154,7 +154,7 @@ secrets:
     file: ./aks.kubeconfig
 services:
   selenium:
-    image: selenium/standalone-chrome
+    image: selenium/standalone-chrome  # Ensure you have a reason for choosing this image over standalone-edge
     container_name: selenium-container
     network_mode: host
     healthcheck:

From e839eb0a8bca934e5e5d330b6a8ceeaa23afc449 Mon Sep 17 00:00:00 2001
From: Shubhada <shpaitha@redhat.com>
Date: Wed, 9 Oct 2024 10:32:00 -0700
Subject: [PATCH 4/5] fix(docker-compose): revert to using
 selenium/standalone-edge

---
 docker-compose.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a5df7bc9398..3cb63412115 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,16 @@ services:
       timeout: 3s
       retries: 3
 
+  selenium:
+    image: selenium/standalone-chrome
+    container_name: selenium-container
+    network_mode: host
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:4444"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
   rp:
     image: ${LOCAL_ARO_RP_IMAGE}:${VERSION}
     build:
@@ -152,13 +162,3 @@ secrets:
     file: ./secrets/proxy.crt
   hive-kubeconfig:
     file: ./aks.kubeconfig
-services:
-  selenium:
-    image: selenium/standalone-chrome  # Ensure you have a reason for choosing this image over standalone-edge
-    container_name: selenium-container
-    network_mode: host
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:4444"]
-      interval: 30s
-      timeout: 10s
-      retries: 3

From c6f0f93b9a4b069cad94029d8a735b102b9bde5b Mon Sep 17 00:00:00 2001
From: Shubhada <shpaitha@redhat.com>
Date: Thu, 10 Oct 2024 14:01:27 -0700
Subject: [PATCH 5/5] Changed the image to
 selenium/standalone-edge:4.10.0-20230607 to match the original configuration

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3cb63412115..77d5964c7e6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       retries: 3
 
   selenium:
-    image: selenium/standalone-chrome
+    image: selenium/standalone-edge:4.10.0-20230607
     container_name: selenium-container
     network_mode: host
     healthcheck: