Make docker command detection consistently across OSes (#254)

Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Jul 26, 2023 · 5b00d67 · 5b00d67
1 parent 8776b89
commit 5b00d67
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -120,7 +120,7 @@ jacocoTestReport {
     }
 }
 
-String version = '5.2.0'
+String version = '5.3.0'
 
 task updateVersion {
     doLast {

diff --git a/tests/jenkins/jobs/RunGradleCheck_Jenkinsfile.txt b/tests/jenkins/jobs/RunGradleCheck_Jenkinsfile.txt
@@ -37,11 +37,11 @@
                 ./gradlew --stop
                 rm -rf ~/.gradle
 
-                if ! (uname -s | grep -i NT); then
+                if command -v docker > /dev/null; then
                     echo "Check existing dockercontainer"
                     docker ps -a
                     docker stop `docker ps -qa` > /dev/null 2>&1 || echo
-                    docker rm `docker ps -qa` > /dev/null 2>&1 || echo
+                    docker rm --force `docker ps -qa` > /dev/null 2>&1 || echo
                     echo "Stop existing dockercontainer"
                     docker ps -a
 

diff --git a/vars/runGradleCheck.groovy b/vars/runGradleCheck.groovy
@@ -51,11 +51,11 @@ void call(Map args = [:]) {
                 ./gradlew --stop
                 rm -rf ~/.gradle
 
-                if ! (uname -s | grep -i NT); then
+                if command -v docker > /dev/null; then
                     echo "Check existing dockercontainer"
                     docker ps -a
                     docker stop `docker ps -qa` > /dev/null 2>&1 || echo
-                    docker rm `docker ps -qa` > /dev/null 2>&1 || echo
+                    docker rm --force `docker ps -qa` > /dev/null 2>&1 || echo
                     echo "Stop existing dockercontainer"
                     docker ps -a