Make main workflow reusable

.github/workflows/commit_trigger.yml

@@ -0,0 +1,36 @@
+name: Pushed Commit
+
+on:
+  push:
+
+
+jobs:
+  get-base-image:
+    runs-on: ubuntu-latest
+    outputs:
+      base_image: ${{ steps.vars.outputs.base_image }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Output the base-image
+        id: vars
+        run: |
+          source ./bin/lib.sh
+          echo "base_image=$(echo_base_image)" >> ${GITHUB_OUTPUT}
+
+
+  trigger:
+    needs: [get-base-image]
+    uses: ./.github/workflows/main.yml
+    with:
+      BASE_IMAGE: ${{ needs.get-base-image.outputs.base_image }}
+      KOSLI_TRAIL: ${{ github.sha }}
+    secrets:
+      DOCKER_USER: ${{ secrets.DOCKER_USER }}
+      DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
+      SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+      KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
+      KOSLI_SONAR_API_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
+

.github/workflows/main.yml

@@ -2,17 +2,36 @@
 name: Main
 
 on:
-  push:
+  workflow_call:
+    inputs:
+      BASE_IMAGE:
+        required: true
+        type: string
+      KOSLI_TRAIL:
+        required: true
+        type: string
+    secrets:
+      DOCKER_USER:
+        required: true
+      DOCKER_PASS:
+        required: true
+      SNYK_TOKEN:
+        required: true
+      KOSLI_API_TOKEN:
+        required: true
+      KOSLI_SONAR_API_TOKEN:
+        required: true
+
 
 env:
+  CYBER_DOJO_DASHBOARD_BASE_IMAGE: ${{ inputs.BASE_IMAGE }}
   KOSLI_CLI_VERSION: ${{ vars.KOSLI_CLI_VERSION }}
   KOSLI_DRY_RUN: ${{ vars.KOSLI_DRY_RUN }}           # false
   KOSLI_HOST: ${{ vars.KOSLI_HOST }}                 # https://app.kosli.com
   KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
   KOSLI_ORG: ${{ vars.KOSLI_ORG }}                   # cyber-dojo
   KOSLI_FLOW: ${{ vars.KOSLI_FLOW }}                 # dashboard-ci
-  KOSLI_TRAIL: ${{ github.sha }}
-  KOSLI_SONAR_API_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
+  KOSLI_TRAIL: ${{ inputs.KOSLI_TRAIL }}
   AWS_ACCOUNT_ID: ${{ vars.AWS_ACCOUNT_ID }}
   AWS_ECR_ID: ${{ vars.AWS_ECR_ID }}
   AWS_REGION: ${{ vars.AWS_REGION }}
@@ -165,7 +184,7 @@ jobs:
 
       - name: Run SonarCloud scan
         env:
-          SONAR_TOKEN: ${{ env.KOSLI_SONAR_API_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.KOSLI_SONAR_API_TOKEN }}
         uses: SonarSource/[email protected]
 
       - name: Setup Kosli CLI

bin/lib.sh

@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 set -Eeu
 
+echo_base_image()
+{
+  local -r json="$(curl --fail --silent --request GET https://beta.cyber-dojo.org/dashboard/base_image)"
+  echo "${json}" | jq -r '.base_image'
+}
+
 echo_versioner_env_vars()
 {
   local -r sha="$(cd "${ROOT_DIR}" && git rev-parse HEAD)"
@@ -25,7 +31,7 @@ echo_versioner_env_vars()
   echo CYBER_DOJO_DASHBOARD_IMAGE="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/dashboard"
 
   if [[ ! -v CYBER_DOJO_DASHBOARD_BASE_IMAGE ]] ; then
-    echo CYBER_DOJO_DASHBOARD_BASE_IMAGE=cyberdojo/sinatra-base:db948c1
+    echo CYBER_DOJO_DASHBOARD_BASE_IMAGE="$(echo_base_image)"
   fi
 }