Merge pull request #104 from scc-digitalhub/build-tool-version

Build tool updates
scc-digitalhub · Jun 20, 2024 · 8e8ac47 · 8e8ac47
2 parents fd8daea + df23b58
commit 8e8ac47
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/builder-tool.yaml b/.github/workflows/builder-tool.yaml
@@ -29,11 +29,18 @@ jobs:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Extract the first 5 characters of the SHA
+        id: extract_sha
+        run: echo "SHA_SHORT=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5.5.1
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=${{ env.SHA_SHORT }}
+          labels: |
+            commit.sha=${{ github.sha }}
           flavor: |
             latest=true          
       - name: Build and push Docker image

diff --git a/core-builder-tool/builder-tool.sh b/core-builder-tool/builder-tool.sh
@@ -99,7 +99,7 @@ handle_error() {
 trap 'handle_error $LINENO "$BASH_COMMAND"' ERR
 
 # Copy everything from source directory to destination directory, excluding context-refs.txt
-rsync -av --exclude='context-refs.txt' --exclude='Dockerfile' --include='.*' "$source_dir/" "$destination_dir/"
+rsync -avL --exclude='context-refs.txt' --exclude='Dockerfile' --include='.*' "$source_dir/" "$destination_dir/"
 
 # Process context-refs.txt
 if [ -f "$source_dir/context-refs.txt" ]; then