Update pages-gh.yml gha-patch-reusable-workflow

.github/workflows/pages-gh.yml

@@ -5,43 +5,54 @@ run-name: Build/deploy Pages/Production
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ["main", "gha-"]
+    branches: ["main", "gha-patch-reusable-workflow"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-
-env:
-  SERVICE: "${{ vars.SERVICE }}"
-  CONTAINER_PROJECT: "coastal-science.github.io" # "rcg-containers" # repo name
-  WEB_URL: "${{ secrets.DOMAIN_NAME }}"
-
+
+  workflow_call: # allows reusing the workflow
+    # inputs:
+    #   target:
+    #     required: false
+    #     type: string
+    # secrets:
+    #   token:
+    #     required: false
+
+# env:
+#   CONTAINER_PROJECT: "coastal-science.github.io" # "rcg-containers" # repo name dynamically extracted from `github.resposity` by removing `github.owner`
 
 # Allow one concurrent deployment
 concurrency:
-  group: "pages"
+  group: ${{ github.repository }}-coastal-pages
   cancel-in-progress: true
 
-# Default to bash
-defaults:
-  run:
-    shell: bash
-
 jobs:
   generate-timestamp:
     permissions: {}
     runs-on: ubuntu-latest
     steps:
-      - name: Set TIMESTAMP
+      - name: Set TIMESTAMP and get REPO_NAME
         id: date
         run: |
              export DATE=$(date +'%Y%m%d-%H%M%S')
+             REPO_NAME=${GITHUB_REPOSITORY#$GITHUB_REPOSITORY_OWNER/}
              echo "TIMESTAMP=$DATE" >> $GITHUB_ENV
+             echo "REPO_NAME=$REPO_NAME" >> $GITHUB_ENV
     outputs:
       TIMESTAMP: ${{ env.TIMESTAMP }}
+      REPO_NAME: ${{ env.REPO_NAME }}
+
+######################################################
+## Build and publish a staging site to GitHub Pages ##
+######################################################
 
   configure-pages:
     runs-on: ubuntu-latest
-    permissions: read-all
+    permissions: # read-all
+      contents: read
+      pages: read
+
     steps:
       - name: Setup Pages
         id: pages
@@ -60,9 +71,10 @@ jobs:
       image: peaceiris/hugo
 
     env:
-      HUGO_VERSION: 0.147.8 # latest  #  0.126.1 
+      HUGO_VERSION: "${{ vars.HUGO_VERSION }}" # 0.147.8 # latest  #  0.126.1 
       HUGO_FORMS: ${{ vars.HUGO_FORMS }}
       HUGO_GOOGLEANALYTICS: ${{ vars.HUGO_GOOGLEANALYTICS }}
+      REPO_NAME: ${{ needs.generate-timestamp.outputs.REPO_NAME }}
 
     # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
     permissions:
@@ -72,7 +84,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: ${{ env.HUGO_VERSION }}
+          hugo-version: ${{ vars.HUGO_VERSION }}
           extended: true
 
       - name: Pre-Build ls
@@ -86,11 +98,13 @@ jobs:
         with:
           submodules: true  # Fetch Hugo themes (true OR recursive) # failing on ubuntu container
           fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
-          # set-safe-directory: '/__w/coastal-science.github.io/coastal-science.github.io'
+          # set-safe-directory: '/__w/coastal-science.github.io/coastal-science.github.io' # The process '/usr/bin/git' failed with exit code 128
+          # set-safe-directory: '/__w/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}' # The process '/usr/bin/git' failed with exit code 128, resorting to manual call
 
       - name: Set safe directory workaround
         run: |
-          git config --global --add safe.directory /__w/coastal-science.github.io/coastal-science.github.io
+          # git config --global --add safe.directory /__w/coastal-science.github.io/coastal-science.github.io
+          git config --global --add safe.directory /__w/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}
 
       - name: Build with Hugo
         env:
@@ -129,20 +143,22 @@ jobs:
         id: deployment
         uses: actions/deploy-pages@v4
 
-  # Create and publish a prod docker image          
-  build_and_push_prod_image:
+############################################
+## Create and publish a prod docker image ##
+############################################
+  build-website-and-container-build:
     environment: docker-image
-
     if: github.ref == 'refs/heads/main'
     needs:
       - generate-timestamp
     env:
-      HUGO_VERSION: 0.147.8 # latest  #  0.126.1 
+      HUGO_VERSION: ${{ vars.HUGO_VERSION }} # 0.147.8 # latest  #  0.126.1 
       HUGO_FORMS: ${{ vars.HUGO_FORMS }}
       HUGO_GOOGLEANALYTICS: ${{ vars.HUGO_GOOGLEANALYTICS }}
 
       REGISTRY: ghcr.io # docker.github.sfu.ca 
       IMAGE_NAME: ${{ github.repository }}
+      REPO_NAME: ${{ needs.generate-timestamp.outputs.REPO_NAME }}
 
     runs-on: ubuntu-latest
     permissions:
@@ -162,10 +178,13 @@ jobs:
           submodules: true  # Fetch Hugo themes (true OR recursive) # failing on ubuntu container
           fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
           # set-safe-directory: '/__w/coastal-science.github.io/coastal-science.github.io'
-
+          # set-safe-directory: '/__w/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}' # The process '/usr/bin/git' failed with exit code 128, resorting to manual call
+
       - name: Set safe directory workaround
         run: |
-          git config --global --add safe.directory /__w/coastal-science.github.io/coastal-science.github.io
+          # git config --global --add safe.directory /__w/coastal-science.github.io/coastal-science.github.io
+          git config --global --add safe.directory /__w/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}
+
 
       - name: Generate tags
         id: tags
@@ -184,11 +203,12 @@ jobs:
 
             # Get the current commit datetime (without timezone)
             commit_date=$(git show -s --format=%ci HEAD)
-
             # remove last five characters (timezone information)
             commit_date=${commit_date:0:${#commit_date}-5} #-5 digits causes 'expression < 0' error. Instead dynamically get the string length.
 
-
+            # Get the current commit datetime (without timezone)
+            commit_date=$(git show -s --date=format:'%Y%m%d-%H%M' --format=%cd HEAD)
+
             # Combine the parts into the desired format
             result="${branch_name}_${commit_hash}_${commit_date}"
 
@@ -205,13 +225,11 @@ jobs:
             commit_hash=$(echo "$commit_hash" | sed 's/[ :\-]/_/g')
 
             commit_date=$(echo $commit_date | xargs)
-            commit_date=$(echo "$commit_date" | sed 's/[ :\-]/_/g')
+            #commit_date=$(echo "$commit_date" | sed 's/[ :\-]/_/g')
 
             # Print the final result and return it
             echo "$formatted_result"
-
-            echo "TAG=${TAG-random}" >> "$GITHUB_OUTPUT"
-            echo "EXTRA_TAG=${EXTRA_TAG}" >> "$GITHUB_OUTPUT"
+
             #echo "branch_name=${branch_name}" >> "$GITHUB_OUTPUT"
             echo "commit_hash=${commit_hash}" >> "$GITHUB_OUTPUT"
             echo "commit_date=${commit_date}" >> "$GITHUB_OUTPUT"
@@ -227,7 +245,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: ${{ env.HUGO_VERSION }}
+          hugo-version: ${{ vars.HUGO_VERSION }}
           extended: true
 
       - name: Build and Minify with Hugo
@@ -258,93 +276,165 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        uses: docker/metadata-action@v5 #96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} # /${{ env.SERVICE }}
           labels: |
             org.opencontainers.image.version=${{ needs.generate-timestamp.outputs.TIMESTAMP }}
+          tags: |
+            # branch event
+            type=ref,event=branch
+            # pull request event
+            type=ref,event=pr
+            # minimal (short sha)
+            type=sha
+            type=raw,value=${{ steps.tags.outputs.commit_date }}
+            type=raw,value=latest
 
-      - name: Build website with Dockerfile.prod
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v6
         env:
           HUGO_BASEURL: "${{ vars.HUGO_BASEURL }}"
-          ORIGINS: "${{ vars.ORIGINS }}"
-          OAUTH_CLIENT_ID: "${{ vars.OAUTH_GITHUB_CLIENT_ID }}"
-          OAUTH_GITHUB_CLIENT_SECRET: "${{ secrets.OAUTH_GITHUB_CLIENT_SECRET }}"
-          CMS_BACKEND_DEBUG: ${{ vars.CMS_BACKEND_DEBUG || ''}}
+        with:
+          context: .
+          file: Dockerfile.prod
+          build-contexts: |
+            public=./public
+            nginx=./nginx
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          push: true
+
+      # - name: Build website with Dockerfile.prod
+      #   env:
+      #     HUGO_BASEURL: "${{ vars.HUGO_BASEURL }}"
+      #     ORIGINS: "${{ vars.ORIGINS }}"
+      #     OAUTH_CLIENT_ID: "${{ vars.OAUTH_GITHUB_CLIENT_ID }}"
+      #     OAUTH_GITHUB_CLIENT_SECRET: "${{ secrets.OAUTH_GITHUB_CLIENT_SECRET }}"
+      #     CMS_BACKEND_DEBUG: ${{ vars.CMS_BACKEND_DEBUG || ''}}
 
-        run: |
-          docker compose -f docker-compose.yaml -f docker-compose.override.yaml build website
-          docker tag website ${{ steps.meta.outputs.tags }}
-          # docker tag website ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tags.outputs.branch_name }}
-          docker tag website ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tags.outputs.commit_hash }}
-          docker tag website ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tags.outputs.commit_date }}
-          docker tag website ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+      #   run: |
+      #     echo "${{ steps.meta.outputs.labels }}"
+      #     prefix="--label "
+      #     LABELS=$(sed "s/^/$prefix/" <<< "${{ steps.meta.outputs.labels }}")                           
+      #     echo $LABELS
+      #     echo "${{ steps.meta.outputs.tags }}"
+      #     docker compose -f docker-compose.yaml -f docker-compose.override.yaml build website
+      #     docker tag website ${{ steps.meta.outputs.tags }}
+      #     # docker tag website ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tags.outputs.branch_name }}
+      #     docker tag website ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tags.outputs.commit_hash }}
+      #     docker tag website ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tags.outputs.commit_date }}
+      #     docker tag website ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
 
-          docker push --all-tags ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      #     docker push --all-tags ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
-  # Create and publish a prod docker image          
-  deploy_prod_image:
-    if: false
-    #if: github.ref == 'refs/heads/main'
-    environment: docker-image
+  # Deploy a prod docker image to orchestrator          
+  deploy-service-prod:
+    # if: false
+    if: github.ref == 'refs/heads/main'
+    environment: 
+      name: docker-image
+      url: https://${{ vars.HUGO_BASEURL }} # may contain secrets.__DOMAIN_NAME__
+      # url: https://${{ vars.__SERVICE__ }}-${{ env.ENVIRONMENT == 'production' && 'latest' || 'dev' }}.ruthjoy.researchcomputinggroup.ca
     permissions:
       contents: read
       packages: read
     needs:
-      - build_and_push_prod_image
-    runs-on: [ self-hosted, rcg ]
-    env:      
-        REGISTRY: ghcr.io # docker.github.sfu.ca 
-        IMAGE_NAME: ${{ github.repository }}
-        ENVIRONMENT: "production"
+      - generate-timestamp
+      - build-website-and-container-build
+    outputs:
+      prod_url: https://${{ secrets.__DOMAIN_.NAME__ }}
+      nomad_url_1: https://${{ vars.__SERVICE__ }}-${{ env.ENVIRONMENT == 'production' && 'latest' || 'dev' }}.ruthjoy.researchcomputinggroup.ca
+      nomad_url_2: https://${{ vars.__SERVICE__ }}-${{ env.ENVIRONMENT == 'production' && 'latest' || 'dev' }}.ruthjoy.researchcomputing.ca
+
+    runs-on: ubuntu-latest
+    # runs-on: [ self-hosted, rcg ]
     container:
       image: alpine:3.18
-
+    env: 
+        REPO_NAME: ${{ needs.generate-timestamp.outputs.REPO_NAME }}
+        SERVICE: "${{ vars.__SERVICE__ }}"
+        JOB_DRIVER: "${{ vars.__JOB_DRIVER__ }}"
+        ENVIRONMENT: "production"
+        WEB_URL: "${{ secrets.__DOMAIN_NAME__ }}"
+        __REGISTRY__: ghcr.io # docker.github.sfu.ca 
+        # CONTAINER_PROJECT: "coastal-science.github.io" # "rcg-containers" # repo name dynamically extracted from `github.resposity` by removing `github.owner`
+        CONTAINER_PROJECT: ${{ needs.generate-timestamp.outputs.REPO_NAME }}
+        # __IMAGE_NAME__="${{ secrets.REGISTRY_SERVER }}/${{ env.CONTAINER_PROJECT }}/${{ env.SERVICE }}"
+        IMAGE_NAME: ${{ vars.__REGISTRY__ }}/${{ github.repository }}
+        FORCE_PULL: ${{ vars.__IMAGE_FORCE_PULL__ }}
+        IMAGE_TAG: latest
+            # needs.generate-timestamp.outputs.TIMESTAMP or even better commit_date
+        #__DATACENTERS__="${{ secrets.NOMAD_SERVER_DATACENTERS }}" \
+        # __NAMESPACE__="${{ secrets.NOMAD_SERVER_NAMESPACE }}" \
+        NOMAD_SERVER_DATACENTERS: "${{ vars.__DATACENTERS__ }}"
+        NOMAD_SERVER_NAMESPACE:  "${{ vars.__NAMESPACE__ }}"
+        # __USERNAME__="${{ secrets.GITLAB_CONTAINER_USERNAME }}" \
+        # __PASSWORD__="${{ secrets.GITLAB_CONTAINER_TOKEN }}" \
+        # __REGISTRY__="${{ secrets.NOMAD_SERVER_DATACENTERS }}" \
+
     steps:
       - name: Prepare Environment
         run: |
              apk update
-             apk add gettext nomad
+             apk add gettext nomad git
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true  # Fetch Hugo themes (true OR recursive) # failing on ubuntu container
+          fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
+          # set-safe-directory: '/__w/coastal-science.github.io/coastal-science.github.io' # The process '/usr/bin/git' failed with exit code 128
+          # set-safe-directory: '${{ env.REPO_NAME }}/${{ env.REPO_NAME }}' # The process '/usr/bin/git' failed with exit code 128, resorting to manual call
 
+      - name: Set safe directory workaround
+        run: |
+          # git config --global --add safe.directory /__w/coastal-science.github.io/coastal-science.github.io
+          git config --global --add safe.directory /__w/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}
+
       - name: Test Nomad
         run: NOMAD_TOKEN=${{ secrets.NOMAD_SERVER_TOKEN }} NOMAD_ADDR=${{ secrets.NOMAD_SERVER_ADDRESS }} nomad status
 
       - name: Setup Nomad Job
         run: |
              __SERVICE__="${{ env.SERVICE }}" \
-             __JOB_DRIVER__="docker" \
-             __ENVIRONMENT__="${{ env.ENVIRONMENT }}" \
+             __JOB_DRIVER__="${{ env.JOB_DRIVER }}" \
+             __ENVIRONMENT__="${{ env.ENVIRONMENT == 'production' && 'latest' || 'dev' }}" \
              __WEB_URL__="${{ env.WEB_URL }}" \
              __JOB_NAME__="${{ env.SERVICE }}-${{ env.ENVIRONMENT }}" \
-             # __IMAGE_NAME__="${{ secrets.REGISTRY_SERVER }}/${{ env.CONTAINER_PROJECT }}/${{ env.SERVICE }}" \
              __IMAGE_NAME__="${{ env.IMAGE_NAME }}" \
-             __IMAGE_TAG__="${{ needs.generate-timestamp.outputs.TIMESTAMP }}" \
-             __DATACENTERS__="${{ secrets.NOMAD_SERVER_DATACENTERS }}"" \
-             __NAMESPACE__="${{ secrets.NOMAD_SERVER_NAMESPACE }}" \
-             #__USERNAME__="${{ secrets.GITLAB_CONTAINER_USERNAME }}" \
-             #__PASSWORD__="${{ secrets.GITLAB_CONTAINER_TOKEN }}" \
-             # __REGISTRY__="${{ secrets.NOMAD_SERVER_DATACENTERS }}" \
+             __IMAGE_TAG__="${{ env.IMAGE_TAG }}" \
+             __IMAGE_FORCE_PULL__="${{ env.FORCE_PULL || 'false' }}" \
+             __DATACENTERS__="${{ env.NOMAD_SERVER_DATACENTERS }}" \
+             __NAMESPACE__="${{ env.NOMAD_SERVER_NAMESPACE }}" \
              envsubst < nomad/template.hcl > ${{ env.SERVICE }}.hcl
              cat ${{ env.SERVICE }}.hcl
 
       - name: Deploy TIMESTAMPED Website To Nomad
         run: NOMAD_TOKEN=${{ secrets.NOMAD_SERVER_TOKEN }} NOMAD_ADDR=${{ secrets.NOMAD_SERVER_ADDRESS }} nomad job run ${{ env.SERVICE }}.hcl
 
+      - name: Summary output URLs
+        run: |
+          echo https://"${{ secrets.__DOMAIN_NAME__ }}" >> "$GITHUB_STEP_SUMMARY"
+          echo https://"${{ vars.__SERVICE__ }}-${{ env.ENVIRONMENT == 'production' && 'latest' || 'dev' }}.ruthjoy.researchcomputinggroup.ca" >> "$GITHUB_STEP_SUMMARY"
+          echo https://"${{ vars.__SERVICE__ }}-${{ env.ENVIRONMENT == 'production' && 'latest' || 'dev' }}.ruthjoy.researchcomputing.ca" >> "$GITHUB_STEP_SUMMARY"
+
   # Cleanup workspace on the runner
   cleanup:
-    # if: ${{ always() }}
+    if: ${{ always() }}
     permissions: {}
     needs: 
       # - build-website
       # - deploy-gh-pages
-      - build_and_push_prod_image
-      - deploy_prod_image
-    # runs-on: ubuntu-latest
-    runs-on: [ self-hosted, rcg ]
+      - build-website-and-container-build
+      - deploy-service-prod
+    runs-on: ubuntu-latest
+    # runs-on: [ self-hosted, rcg ]
     steps:
       - name: Current workspace
         run: du -shc ${GITHUB_WORKSPACE}
       - name: Clean Up Docker Images
-        run: docker rmi -f $(docker images '${{ needs.build_and_push_prod_image.outputs.tags }}' -a -q)
+        run: docker rmi -f $(docker images '${{ needs.build-website-and-container-build.outputs.tags }}' -a -q) || echo "No docker images found to remove...skipping removal."
       - name: Clean Up Workspace
         run: rm -rf ${GITHUB_WORKSPACE}