Changed apptainer def file name

Changed hepscore .def to apptainer.def. This should be done consistently for any future singularity def files, to keep the logic for listing and pushing them the same as Dockerfiles.
stfc · Oct 4, 2023 · 13706ed · 13706ed
1 parent 2807307
commit 13706ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build_images.yaml b/.github/workflows/build_images.yaml
@@ -18,7 +18,7 @@ jobs:
           find -name Dockerfile | sed -r 's#\./(.+)/Dockerfile#\1#g' | jq -Rsc 'split("\n")[:-1]'
         )" >> $GITHUB_OUTPUT
         echo "apptainer-images=$(
-          find -name *.def | sed -r 's#\./(.+)(\.def)#\1#g' | jq -Rsc 'split("\n")[:-1]'
+          find -name apptainer.def | sed -r 's#\./(.+)(\/apptainer\.def)#\1#g' | jq -Rsc 'split("\n")[:-1]'
         )" >> $GITHUB_OUTPUT
         echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
     outputs:
@@ -89,13 +89,13 @@ jobs:
       - name: Build apptainer & push to prod
         if: ${{ github.ref == 'refs/heads/master' }}
         run: |
-           singularity build container.sif ${{ matrix.image }}.def
+           singularity build container.sif ${{ matrix.image }}/apptainer.def
            singularity push container.sif harbor.stfc.ac.uk/stfc-cloud/${{ matrix.image }}:${{ needs.setup.outputs.sha }}
 
       - name: Build apptainer & push to staging
         if: ${{ github.ref != 'refs/heads/master' }}
         run: |
-           singularity build container.sif ${{ matrix.image }}.def
+           singularity build container.sif ${{ matrix.image }}/apptainer.def
            singularity push container.sif harbor.stfc.ac.uk/stfc-cloud-staging/${{ matrix.image }}:${{ needs.setup.outputs.sha }}
 
       - name: Inform of tagged name apptainer

diff --git a/hepscore/hepscore.def → hepscore/apptainer.def b/hepscore/hepscore.def → hepscore/apptainer.def