docker/run.sh: add -D option and use it in GH actions to avoid over-b…

…uilding
usnistgov · Nov 3, 2023 · 0304b3d · 0304b3d
1 parent 3543d16
commit 0304b3d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -23,14 +23,14 @@ jobs:
           cd docker && bash ./dockbuild.sh
 
       - name: Build & Run Python Tests via Docker
-        run: cd docker && ./testall python
+        run: cd docker && ./testall -D python
 
       - name: Build & Run Java Tests via Docker
-        run: cd docker && ./makedist java
+        run: cd docker && ./makedist -D java
 
       - name: Build Angular Code
-        run: cd docker && ./makedist angular
+        run: cd docker && ./makedist -D angular
 
       - name: Run Angular Tests
-        run: cd docker && ./testall angular
+        run: cd docker && ./testall -D angular
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,14 +23,14 @@ jobs:
           cd docker && bash ./dockbuild.sh
 
       - name: Build & Run Python Tests via Docker
-        run: cd docker && ./testall python
+        run: cd docker && ./testall -D python
 
       - name: Build & Run Java Tests via Docker
-        run: cd docker && ./makedist java
+        run: cd docker && ./makedist -D java
 
       - name: Build Angular Code
-        run: cd docker && ./makedist angular
+        run: cd docker && ./makedist -D angular
 
       - name: Run Angular Tests
-        run: cd docker && ./testall angular
+        run: cd docker && ./testall -D angular
 
diff --git a/.github/workflows/python-source.yml b/.github/workflows/python-source.yml
@@ -27,5 +27,5 @@ jobs:
           cd docker && bash ./dockbuild.sh python
 
       - name: Run Unit Tests via Docker
-        run: cd docker && ./testall python
+        run: cd docker && ./testall -D python
 
diff --git a/.github/workflows/testall.yml b/.github/workflows/testall.yml
@@ -27,13 +27,13 @@ jobs:
           cd docker && bash ./dockbuild.sh
 
       - name: Build & Run Python Tests via Docker
-        run: cd docker && ./testall python
+        run: cd docker && ./testall -D python
 
       - name: Test Java via Docker
-        run: cd docker && ./testall java
+        run: cd docker && ./testall -D java
 
       - name: Build Angular Code
-        run: cd docker && ./makedist angular
+        run: cd docker && ./makedist -D angular
 
       - name: Run Angular Tests
-        run: cd docker && ./testall angular
+        run: cd docker && ./testall -D angular
diff --git a/docker/run.sh b/docker/run.sh
@@ -76,6 +76,9 @@ while [ "$1" != "" ]; do
         -d|--docker-build)
             dodockbuild=1
             ;;
+        -D|--no-docker-build)
+            dodockbuild=0
+            ;;
         --dist-dir)
             shift
             distdir="$1"
@@ -172,7 +175,7 @@ if [ -z "$dodockbuild" ]; then
     fi
 fi
 
-[ -z "$dodockbuild" ] || {
+[ "$dodockbuild" != "1" ] || {
     echo '#' Building missing docker containers...
     $execdir/dockbuild.sh
 }