update actions from main branch (dtq-dev)

.github/workflows/docker.yml

@@ -31,7 +31,7 @@ jobs:
       build_id: dspace-dependencies
       image_name: dataquest/dspace-dependencies
       dockerfile_path: ./Dockerfile.dependencies
-
+  
 
   #######################################
   # Build/Push the 'dataquest/dspace' image

.github/workflows/reusable-docker-build.yml

@@ -64,6 +64,7 @@ env:
   # For a new tag, copy that tag name as the tag for Docker image.
   IMAGE_TAGS: |
     type=raw,value=dspace-7_x,enable=${{ github.ref_name == github.event.repository.default_branch }}
+    type=raw,value=${{ github.sha }}
     type=ref,event=branch,enable=${{ github.ref_name != github.event.repository.default_branch }}
     type=ref,event=tag
   # Define default tag "flavor" for docker/metadata-action per
@@ -108,7 +109,7 @@ jobs:
 
       - name: Add version
         if: ${{ inputs.run_python_version_script }}
-        run: python scripts/sourceversion.py > ${{ inputs.python_version_script_dest }}
+        run: python scripts/sourceversion.py ${{ github.server_url }}/${{ github.repository }}/actions/runs/ ${{ github.run_id }} > ${{ inputs.python_version_script_dest }}
 
       # https://github.com/docker/setup-buildx-action
       - name: Setup Docker Buildx

.github/workflows/tag-release.yml

@@ -0,0 +1,28 @@
+name: Release
+
+on:
+  push:
+    tags:      
+      - '**'
+
+env:
+  IMAGE_BASE_NAME: dataquest/dspace
+
+jobs:
+  retag-BE-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      - name: retag image
+        run: |
+          docker pull ${{ env.IMAGE_BASE_NAME }}:${{ github.sha }}
+          docker tag ${{ env.IMAGE_BASE_NAME }}:${{ github.sha }} ${{ env.IMAGE_BASE_NAME }}:${{ github.ref_name }}
+
+      - name: push image
+        run: docker push ${{ env.IMAGE_BASE_NAME }}:${{ github.ref_name }}
+

Dockerfile.cli

@@ -8,7 +8,7 @@
 ARG JDK_VERSION=11
 
 # Step 1 - Run Maven Build
-FROM dataquest/dspace-dependencies:migrate-to-7.5 as build
+FROM dataquest/dspace-dependencies:dspace-7_x as build
 ARG TARGET_DIR=dspace-installer
 WORKDIR /app
 # The dspace-installer directory will be written to /install

Dockerfile.test

@@ -10,7 +10,7 @@
 ARG JDK_VERSION=11
 
 # Step 1 - Run Maven Build
-FROM dataquest/dspace-dependencies:migrate-to-7.5 as build
+FROM dataquest/dspace-dependencies:dspace-7_x as build
 ARG TARGET_DIR=dspace-installer
 WORKDIR /app
 # The dspace-installer directory will be written to /install

scripts/sourceversion.py

@@ -1,14 +1,13 @@
 import subprocess
+import sys
 from datetime import datetime
 
 if __name__ == '__main__':
     ts = datetime.now()
-    print(f"timestamp: {ts}")
+    print(f"This info was generated on: {ts}")
 
-    cmd = 'git log -1 --pretty=format:"%h - %ai"'
-    print(f">{cmd}")
+    cmd = 'git log -1 --pretty=format:"Git hash: %H Date of commit: %ai"'
     subprocess.check_call(cmd, shell=True)
 
-    cmd = 'git status --porcelain'
-    print(f">{cmd}:")
-    subprocess.check_call(cmd, shell=True)
+    link = sys.argv[1] + sys.argv[2]
+    print(' Build run: ' + link + ' ')