Merge pull request #25 from cyber-dojo/tidy-ci-setup

Tidy variable setup in CI workflow

.github/workflows/main.yml

@@ -12,6 +12,7 @@ env:
   KOSLI_FLOW: ${{ vars.KOSLI_FLOW }}                 # runner-ci
   KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
   KOSLI_TRAIL: ${{ github.sha }}
+  AWS_ACCOUNT_ID: ${{ vars.AWS_ACCOUNT_ID }}
   AWS_REGION: ${{ vars.AWS_REGION }}
   SERVICE_NAME: ${{ github.event.repository.name }}  # runner
   IMAGE_TAR_FILENAME: /tmp/${{ github.event.repository.name }}:${{ github.sha }}.tar
@@ -37,18 +38,17 @@ jobs:
       - name: Prepare outputs for workflow jobs
         id: vars
         run: |
-          AWS_ID=244531986313
-          ECR_REGISTRY="${AWS_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com"
-
           IMAGE_TAG=${GITHUB_SHA:0:7}        
           IMAGE_TAG_PREVIOUS=$(git rev-parse --short=7 HEAD^)
+
+          ECR_REGISTRY="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com"
           
           IMAGE_NAME="${ECR_REGISTRY}/${{ env.SERVICE_NAME }}:${IMAGE_TAG}"
           IMAGE_NAME_PREVIOUS="${ECR_REGISTRY}/${{ env.SERVICE_NAME }}:${IMAGE_TAG_PREVIOUS}"
           
-          echo "aws_account_id=${AWS_ID}"                     >> ${GITHUB_OUTPUT}
+          echo "aws_account_id=${AWS_ACCOUNT_ID}"             >> ${GITHUB_OUTPUT}
           echo "ecr_registry=${ECR_REGISTRY}"                 >> ${GITHUB_OUTPUT}
-          echo "aws_region=eu-central-1"                      >> ${GITHUB_OUTPUT}
+          echo "aws_region=${AWS_REGION}"                     >> ${GITHUB_OUTPUT}
           echo "gh_actions_iam_role_name=gh_actions_services" >> ${GITHUB_OUTPUT}
           echo "service_name=${{ env.SERVICE_NAME }}"         >> ${GITHUB_OUTPUT}
           echo "image_tag=${IMAGE_TAG}"                       >> ${GITHUB_OUTPUT}