diff --git a/.github/workflows/main_staging.yml b/.github/workflows/main_staging.yml index cb3145a..32920b0 100644 --- a/.github/workflows/main_staging.yml +++ b/.github/workflows/main_staging.yml @@ -51,9 +51,9 @@ jobs: - name: Report image to Kosli flow run: | IMAGE_TAG="$(echo $GITHUB_SHA | head -c7)" - ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${IMAGE_TAG} - docker pull ${ARTIFACT_NAME} - kosli report artifact ${ARTIFACT_NAME} \ + IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${IMAGE_TAG} + docker pull ${IMAGE_NAME} + kosli report artifact ${IMAGE_NAME} \ --artifact-type=docker test: diff --git a/.github/workflows/sub_approve_deployment.yml b/.github/workflows/sub_approve_deployment.yml index 53e6f6b..1ab2fe5 100644 --- a/.github/workflows/sub_approve_deployment.yml +++ b/.github/workflows/sub_approve_deployment.yml @@ -41,18 +41,18 @@ jobs: - name: Report approval of deployment run: | - ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }} - docker pull ${ARTIFACT_NAME} - kosli report approval ${ARTIFACT_NAME} \ + IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }} + docker pull ${IMAGE_NAME} + kosli report approval ${IMAGE_NAME} \ --artifact-type=docker \ --environment=${{ inputs.KOSLI_ENVIRONMENT }} \ --approver="${{ github.actor }}" - name: Report expected deployment to Kosli run: | - ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }} - docker pull ${ARTIFACT_NAME} - kosli expect deployment ${ARTIFACT_NAME} \ + IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }} + docker pull ${IMAGE_NAME} + kosli expect deployment ${IMAGE_NAME} \ --artifact-type=docker \ --description="Deployed to ${{ inputs.KOSLI_ENVIRONMENT }} in Github Actions pipeline" \ --environment=${{ inputs.KOSLI_ENVIRONMENT }} diff --git a/.github/workflows/sub_build_image.yml b/.github/workflows/sub_build_image.yml index 9a39cbe..c763dfe 100644 --- a/.github/workflows/sub_build_image.yml +++ b/.github/workflows/sub_build_image.yml @@ -53,6 +53,6 @@ jobs: - name: Report image to Kosli flow run: | - ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }} - kosli report artifact ${ARTIFACT_NAME} \ + IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }} + kosli report artifact ${IMAGE_NAME} \ --artifact-type=docker diff --git a/.github/workflows/sub_sdlc_gate.yml b/.github/workflows/sub_sdlc_gate.yml index 9844f9f..683a0f0 100644 --- a/.github/workflows/sub_sdlc_gate.yml +++ b/.github/workflows/sub_sdlc_gate.yml @@ -32,7 +32,7 @@ jobs: - name: Kosli SDLC gate to short-circuit-the-flow run: | - ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }} - docker pull ${ARTIFACT_NAME} - kosli assert artifact ${ARTIFACT_NAME} \ + IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }} + docker pull ${IMAGE_NAME} + kosli assert artifact ${IMAGE_NAME} \ --artifact-type=docker diff --git a/.github/workflows/sub_test.yml b/.github/workflows/sub_test.yml index a3fdfba..28eb669 100644 --- a/.github/workflows/sub_test.yml +++ b/.github/workflows/sub_test.yml @@ -58,9 +58,9 @@ jobs: - name: Report Snyk results to Kosli flow run: | - ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }} - docker pull ${ARTIFACT_NAME} - kosli report evidence artifact snyk ${ARTIFACT_NAME} \ + IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }} + docker pull ${IMAGE_NAME} + kosli report evidence artifact snyk ${IMAGE_NAME} \ --artifact-type=docker \ --name=snyk-scan \ --scan-results=snyk.json @@ -82,9 +82,9 @@ jobs: - name: Report pull-request evidence to Kosli run: | - ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }} - docker pull ${ARTIFACT_NAME} - kosli report evidence artifact pullrequest github ${ARTIFACT_NAME} \ + IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }} + docker pull ${IMAGE_NAME} + kosli report evidence artifact pullrequest github ${IMAGE_NAME} \ --artifact-type=docker \ --github-token ${{ secrets.GITHUB_TOKEN }} \ --name=pull-request