slimming down workflows and docker steps

Author: bendhouseart

.github/workflows/apptainer-build-local.yml

@@ -1,6 +1,8 @@
 name: Test Apptainer Build Local
 
 on:
+  push:
+    branches: [ master ]
   pull_request:
     branches: [ master ]
   workflow_run:
@@ -41,46 +43,14 @@ jobs:
         run: |
           make get-test-data
 
-      - name: Cache Docker images
-        uses: actions/cache@v4
-        id: docker-cache
-        with:
-          path: |
-            mongo.tar
-            api.tar
-            handler.tar
-            ui.tar
-          key: docker-local-images-${{ github.event.workflow_run.head_sha || github.sha }}
-          restore-keys: |
-            docker-local-images-
-
       - name: Setup environment
         run: |
           # copy the example.env to .env
           cp example.env .env
 
           # Update .env to use the hostname
           sed -i "s/SERVER_NAME=.*/SERVER_NAME=localhost/" .env
-
-      - name: Build or load images
-        run: |
-          if [ -f mongo.tar ] && [ -f api.tar ] && [ -f handler.tar ] && [ -f ui.tar ]; then
-            echo "Loading cached images..."
-            if ! docker load < mongo.tar || ! docker load < api.tar || ! docker load < handler.tar || ! docker load < ui.tar; then
-              echo "Failed to load cached images, building instead..."
-              docker compose -f ${{ env.COMPOSE_FILE }} build
-            else
-              rm mongo.tar api.tar handler.tar ui.tar
-            fi
-          else
-            echo "Building images..."
-            docker compose -f ${{ env.COMPOSE_FILE }} build
-          fi
           
-          # Tag the images to match docker-compose
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-api:latest api:latest
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-handler:latest handler:latest
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-ui:latest ui:latest
 
       - name: Clean Up some More Space
         run: bash .github/scripts/util_free_space.sh

.github/workflows/test-upload-local.yml

@@ -79,10 +79,26 @@ jobs:
             docker compose -f ${{ env.COMPOSE_FILE }} build
           fi
           
-          # Tag the images to match docker-compose
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-api:latest api:latest
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-handler:latest handler:latest
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-ui:latest ui:latest
+
+      - name: Save images to cache
+        run: |
+          # Save images for future use
+          docker save mongo:4.4.15 > mongo.tar
+          docker save openneuropet/ezbids-api:latest > api.tar
+          docker save openneuropet/ezbids-handler:latest > handler.tar
+          docker save openneuropet/ezbids-ui:latest > ui.tar
+
+      - name: Cache Docker images
+        uses: actions/cache@v4
+        with:
+          path: |
+            mongo.tar
+            api.tar
+            handler.tar
+            ui.tar
+          key: test-local-docker-images-${{ github.event.workflow_run.head_sha || github.sha }}
+          restore-keys: |
+            test-local-docker-images-
 
       - name: Start services
         run: |

.github/workflows/test-upload-nginx.yml

@@ -1,6 +1,8 @@
 name: Test Nginx Upload
 
 on:
+  push:
+    branches: [ master ]
   pull_request:
     branches: [ master ]
   workflow_run:
@@ -89,9 +91,6 @@ jobs:
             docker compose -f ${{ env.COMPOSE_FILE }} build
           fi
           
-          # Tag the images to match docker-compose
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-api:latest api:latest
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-handler:latest handler:latest
 
       - name: Build or load nginx images
         run: |
@@ -108,8 +107,28 @@ jobs:
             docker compose -f ${{ env.COMPOSE_FILE }} build
           fi
           
-          # Tag the UI image to match docker-compose
-          docker tag ${REGISTRY_PREFIX}/${REPO_NAME}-ui:latest ui:latest
+
+      - name: Save nginx images to cache
+        run: |
+          # Save nginx-specific images for future use
+          docker save mongo:4.4.15 > mongo.tar
+          docker save openneuropet/ezbids-api:latest > api.tar
+          docker save openneuropet/ezbids-handler:latest > handler.tar
+          docker save openneuropet/ezbids-ui-nginx:latest > ui-nginx.tar
+          docker save nginx:latest > nginx.tar
+
+      - name: Cache Docker images
+        uses: actions/cache@v4
+        with:
+          path: |
+            mongo.tar
+            api.tar
+            handler.tar
+            ui-nginx.tar
+            nginx.tar
+          key: test-nginx-docker-images-${{ github.event.workflow_run.head_sha || github.sha }}
+          restore-keys: |
+            test-nginx-docker-images-
 
       - name: Do additional Nginx setup
         run: |