From 13706edd12bf4b3ab81f6fd367b1353162ec92c6 Mon Sep 17 00:00:00 2001
From: Adam Greenbank <adam.greenbank@stfc.ac.uk>
Date: Wed, 4 Oct 2023 16:08:06 +0100
Subject: [PATCH] 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.

---
 .github/workflows/build_images.yaml      | 6 +++---
 hepscore/{hepscore.def => apptainer.def} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename hepscore/{hepscore.def => apptainer.def} (100%)

diff --git a/.github/workflows/build_images.yaml b/.github/workflows/build_images.yaml
index 7cea745..2646ab4 100644
--- 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 b/hepscore/apptainer.def
similarity index 100%
rename from hepscore/hepscore.def
rename to hepscore/apptainer.def