Feature/auto release action

.github/workflows/manual-release.yml

@@ -6,9 +6,17 @@ on:
       env:
         description: 'Environment to deploy to'
         required: false
-      image_tag:
+      image-tag:
         description: 'The SHA of the Git commit to use'
         required: false
+      core-repo-reference:
+        description: 'The SHA to set the core repo to'
+        required: false
+        default: refs/heads/main
+      config-repo-reference:
+        description: 'The SHA to set the config repo to'
+        required: false
+        default: refs/heads/main
 
 permissions:
   contents: read
@@ -52,44 +60,30 @@ jobs:
     needs:
       - set-vars
       - start-runner
-    uses: i-dot-ai/i-dot-ai-core-github-actions/.github/workflows/apply-terraform.yml@main
+    uses: i-dot-ai/i-dot-ai-core-github-actions/.github/workflows/apply-terraform.yml@353925b7de65e86e6af44027fb2e17e577776319
     with:
       APP_NAME: ${{ needs.set-vars.outputs.app-name }}
       RUNNER_LABEL: ${{ needs.start-runner.outputs.label }}
       INFRASTRUCTURE_FOLDER: "infrastructure/aws"
       PUBLIC_INFRA_DEPLOYMENT: true
       ENVIRONMENT: ${{ github.event.inputs.env }}
       INFRA_CONFIG_REPO: ${{ needs.set-vars.outputs.infra-config-repo }}
+      CORE_INFRA_REF: ${{ github.event.inputs.core-repo-reference }}
+      INFRA_CONFIG_REF: ${{ github.event.inputs.config-repo-reference }}
+      IMAGE_TAG: ${{ github.event.inputs.image-tag }}
     secrets:
       AWS_GITHUBRUNNER_PAT: ${{ secrets.AWS_GITHUBRUNNER_PAT}}
       AWS_GITHUBRUNNER_PAT_USER: ${{ secrets.AWS_GITHUBRUNNER_PAT_USER }}
       AWS_REGION: ${{ secrets.AWS_REGION }}
       AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
 
-#  release:
-#    runs-on: ${{ needs.start-runner.outputs.label }}
-#    needs:
-#      - set-vars
-#      - start-runner
-#    steps:
-#      - uses: actions/checkout@v3
-#
-#      - name: Set up Python 3.11
-#        uses: actions/setup-python@v3
-#        with:
-#          python-version: "3.11"
-#
-#      - name: Make release
-#        run: |
-#          make tf_auto_deploy env=${{ github.event.inputs.env }} IMAGE_TAG=${{ github.event.inputs.image_tag }}
-
   stop-runner:
     uses: i-dot-ai/i-dot-ai-core-github-actions/.github/workflows/stop-runner.yml@main
     if: needs.start-runner.outputs.use-persisted == 0 && always()
     needs:
       - set-vars
       - start-runner
-      - build-image
+      - release-terraform
     with:
       RUNNER_LABEL: ${{ needs.start-runner.outputs.label }}
       EC2_INSTANCE_ID: ${{ needs.start-runner.outputs.ec2-instance-id }}

Makefile

@@ -134,8 +134,10 @@ docker_push:
 
 .PHONY: docker_update_tag
 docker_update_tag:
-	MANIFEST=$$(aws ecr batch-get-image --repository-name $(ECR_REPO_NAME) --image-ids imageTag=$(IMAGE_TAG) --query 'images[].imageManifest' --output text) && \
-	aws ecr put-image --repository-name $(ECR_REPO_NAME) --image-tag $(tag) --image-manifest "$$MANIFEST"
+	for service in django-app core-api worker; do \
+		MANIFEST=$$(aws ecr batch-get-image --repository-name $(ECR_REPO_NAME)-$$service --image-ids imageTag=$(IMAGE_TAG) --query 'images[].imageManifest' --output text) && \
+		aws ecr put-image --repository-name $(ECR_REPO_NAME)-$$service--image-tag $(tag) --image-manifest "$$MANIFEST"
+	done
 
 
 # Ouputs the value that you're after - usefx	ul to get a value i.e. IMAGE_TAG out of the Makefile
@@ -186,7 +188,7 @@ tf_apply_universal: ## Apply terraform
 .PHONY: tf_auto_apply
 tf_auto_apply: ## Auto apply terraform
 	make tf_set_workspace && \
-	terraform -chdir=./infrastructure/aws apply -auto-approve -var-file=$(CONFIG_DIR)/${env}-input-params.tfvars ${tf_build_args}
+	terraform -chdir=./infrastructure/aws apply -auto-approve -lock-timeout=300s -var-file=$(CONFIG_DIR)/${env}-input-params.tfvars ${tf_build_args} -target="module.django-app" -target="module.core-api" -target="module.worker"
 
 .PHONY: tf_destroy
 tf_destroy: ## Destroy terraform