fix image tags (#30)

* fix tags

* test replacement

* rever package files

* test

* test

* Update image.yml

* Update image.yml

* Update image-release.yml

* Update image.yml

* update singularity CI

* Update image.yml

* update ci

Author: cbaker6

.github/workflows/image-release.yml

@@ -49,7 +49,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
-            latest=false
+            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
@@ -86,7 +86,7 @@ jobs:
       - name: Get release version
         run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
 
-      - name: Build Container
+      - name: Create tag for Singularity
         env:
           recipe: ${{ matrix.recipe }}
         run: |
@@ -106,6 +106,10 @@ 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

@@ -58,7 +58,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
-            latest=true
+            latest=false
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
@@ -83,12 +83,17 @@ jobs:
     steps:
       - name: Check out code for the container build
         uses: actions/checkout@v3
+
       - name: Continue if Singularity Recipe Exists
         run: |
           if [[ -f "${{ matrix.recipe }}" ]]; then
             echo "keepgoing=true" >> $GITHUB_ENV
-          fi          
-      - name: Build Container
+          fi
+
+      - name: Get build branch name
+        run: echo "TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV       
+
+      - name: Create tag for Singularity
         if: ${{ env.keepgoing == 'true' }}
         env:
           recipe: ${{ matrix.recipe }}
@@ -98,16 +103,20 @@ jobs:
             sudo -E singularity build container.sif ${{ matrix.recipe }}
             tag=$(echo "${recipe/Singularity\./}")
             if [ "$tag" == "Singularity" ]; then
-                tag=latest
+                tag=$TAG
             fi
-            # Build the container and name by tag
             echo "Tag is $tag."
             echo "tag=$tag" >> $GITHUB_ENV
          else
            echo "${{ matrix.recipe }} is not found."
            echo "Present working directory: $PWD"
            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:

Singularity

@@ -1,5 +1,3 @@
 Bootstrap: docker
 From: netreconlab/parse-hipaa-dashboard:latest
 
-%runscript
-echo "Successfully built singularity from docker!"

package-lock.json

@@ -35,7 +35,7 @@
     "@types/jasmine": "4.3.1",
     "eslint": "8.30.0",
     "eslint-plugin-flowtype": "8.0.3",
-    "jasmine": "^4.0.2",
+    "jasmine": "^4.5.0",
     "madge": "5.0.1",
     "nyc": "15.1.0",
     "typescript": "4.9.4"