fix Singularity files

Author: cbaker6

.github/workflows/ci.yml

@@ -29,6 +29,7 @@ jobs:
        - name: Install dependencies
          run: npm ci
        - run: npm run madge:circular
+
   check-lint:
      name: Lint
      timeout-minutes: 5
@@ -49,6 +50,7 @@ jobs:
        - name: Install dependencies
          run: npm ci
        - run: npm run lint
+
   check-tests:
     name: Tests
     timeout-minutes: 5

.github/workflows/image-release.yml

@@ -5,9 +5,7 @@ on:
     tags: [ '*.*.*' ]
 
 env:
-  # Use docker.io for Docker Hub if empty
   REGISTRY: docker.io
-  # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
 
 concurrency:
@@ -32,26 +30,21 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
       - name: Log into dockerhub
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
             latest=true
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v3
         with:
@@ -86,7 +79,12 @@ jobs:
       - name: Get release version
         run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
 
-      - name: Create tag for Singularity
+      - name: Update Singularity file tag
+        if: github.event_name != 'pull_request'
+        run: |
+         sed -i "s/latest/$TAG/" ./Singularity
+
+      - name: Build Singularity image 
         env:
           recipe: ${{ matrix.recipe }}
         run: |
@@ -106,10 +104,6 @@ jobs:
            ls
          fi
 
-      - name: Update Singularity file tag
-        run: |
-          sed -i "s/latest/$tag/" ./Singularity
-
       - name: Login and Deploy Container
         #if: (github.event_name != 'pull_request')
         env:

.github/workflows/image.yml

@@ -1,10 +1,5 @@
 name: image
 
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
 on:
   schedule:
     - cron: '19 17 * * *'
@@ -14,9 +9,7 @@ on:
     branches: [ main ]
 
 env:
-  # Use docker.io for Docker Hub if empty
   REGISTRY: docker.io
-  # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
 
 concurrency:
@@ -41,17 +34,13 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
       - name: Log into dockerhub
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v4
@@ -60,8 +49,6 @@ jobs:
           flavor: |
             latest=false
 
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         uses: docker/build-push-action@v3
         with:
@@ -93,7 +80,12 @@ jobs:
       - name: Get build branch name
         run: echo "TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV       
 
-      - name: Create tag for Singularity
+      - name: Update Singularity file tag
+        if: github.event_name != 'pull_request'
+        run: |
+         sed -i "s/latest/$TAG/" ./Singularity
+
+      - name: Build Singularity image 
         if: ${{ env.keepgoing == 'true' }}
         env:
           recipe: ${{ matrix.recipe }}
@@ -113,10 +105,6 @@ jobs:
            ls
          fi
 
-      - name: Update Singularity file tag
-        run: |
-         sed -i "s/latest/$tag/" ./Singularity
-
       - name: Login and Deploy Container
         if: (github.event_name != 'pull_request')
         env:

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-hipaa-dashboard",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "The Parse-HIPAA Dashboard.",
   "main": "./lib/index.js",
   "repository": {