Exiting container when Standalone or Node exits (#1504)

* Exiting container when Standalone or Node exits
SeleniumHQ · Feb 7, 2022 · 281e5c4 · 281e5c4
1 parent f96102b
commit 281e5c4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/k8s-deploy-test.yml b/.github/workflows/k8s-deploy-test.yml
@@ -1,12 +1,7 @@
 name: "Test Selenium Grid 4 deployment on Minikube Cluster"
 
 on:
-  push:
-    branches:
-      - trunk
-  pull_request:
-    branches:
-      - trunk
+  workflow_dispatch:
 
 jobs:
   deploy:
@@ -18,10 +13,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.3.0
+        uses: manusa/actions-setup-minikube@v2.4.3
         with:
-          minikube version: "v1.13.1"
-          kubernetes version: "v1.19.2"
+          minikube version: 'v1.24.0'
+          kubernetes version: 'v1.23.0'
           github token: ${{ secrets.GITHUB_TOKEN }}
           driver: none
       - name: Interact with Minikube

diff --git a/NodeBase/selenium.conf b/NodeBase/selenium.conf
@@ -61,7 +61,8 @@ stderr_capture_maxbytes=50MB
 
 [program:selenium-node]
 priority=15
-command=/opt/bin/start-selenium-node.sh
+command=bash -c "/opt/bin/start-selenium-node.sh && kill -s SIGINT `cat /var/run/supervisor/supervisord.pid`"
+stopasgroup = true
 autostart=true
 autorestart=false
 startsecs=0

diff --git a/Standalone/selenium.conf b/Standalone/selenium.conf
@@ -61,7 +61,8 @@ stderr_capture_maxbytes=50MB
 
 [program:selenium-standalone]
 priority=15
-command=/opt/bin/start-selenium-standalone.sh
+command=bash -c "/opt/bin/start-selenium-standalone.sh && kill -s SIGINT `cat /var/run/supervisor/supervisord.pid`"
+stopasgroup = true
 autostart=true
 autorestart=false
 startsecs=0