Cleanup docker image lookup

DFE-Digital · Oct 13, 2023 · 1ad1e74 · 1ad1e74
1 parent 6af503d
commit 1ad1e74
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 62 deletions.
diff --git a/.github/workflows/aks_deploy.yml b/.github/workflows/aks_deploy.yml
@@ -76,62 +76,3 @@ jobs:
         with:
           message: |
             Review app deployed to ${{ steps.deploy.outputs.url }}
-
-#  deploy_staging:
-#    name: Deploy staging
-#    needs: [docker, rspec, cypress, lint, brakeman]
-#    runs-on: ubuntu-latest
-#    if: github.ref == 'refs/heads/main'
-#    environment:
-#      name: staging
-#    outputs:
-#      docker-image: ${{ needs.docker.outputs.docker-image }}
-#    steps:
-#      - uses: actions/checkout@v3
-#
-#      - uses: ./.github/actions/deploy-environment-to-aks
-#        id: deploy
-#        with:
-#          environment: staging
-#          docker-image: ${{ needs.docker.outputs.docker-image }}
-#          azure-credentials: ${{ secrets.AZURE_CREDENTIALS }}
-#          current-commit-sha: ${{ github.sha }}
-#          statuscake-api-token: ${{ secrets.STATUSCAKE_API_TOKEN }}
-#
-#  deploy_sandbox:
-#    name: Deploy sandbox
-#    needs: [deploy_staging]
-#    runs-on: ubuntu-latest
-#    environment:
-#      name: sandbox
-#
-#    steps:
-#      - uses: actions/checkout@v3
-#
-#      - uses: ./.github/actions/deploy-environment-to-aks
-#        id: deploy
-#        with:
-#          environment: sandbox
-#          docker-image: ${{ needs.deploy_staging.outputs.docker-image }}
-#          azure-credentials: ${{ secrets.AZURE_CREDENTIALS }}
-#          current-commit-sha: ${{ github.sha }}
-#          statuscake-api-token: ${{ secrets.STATUSCAKE_API_TOKEN }}
-#
-#  deploy_production:
-#    name: Deploy production
-#    needs: [deploy_staging]
-#    runs-on: ubuntu-latest
-#    environment:
-#      name: production
-#
-#    steps:
-#      - uses: actions/checkout@v3
-#
-#      - uses: ./.github/actions/deploy-environment-to-aks
-#        id: deploy
-#        with:
-#          environment: production
-#          docker-image: ${{ needs.deploy_staging.outputs.docker-image }}
-#          azure-credentials: ${{ secrets.AZURE_CREDENTIALS }}
-#          current-commit-sha: ${{ github.sha }}
-#          statuscake-api-token: ${{ secrets.STATUSCAKE_API_TOKEN }}
diff --git a/Makefile b/Makefile
@@ -53,8 +53,6 @@ set-azure-account:
 	[ "${SKIP_AZURE_LOGIN}" != "true" ] && az account set -s ${AZURE_SUBSCRIPTION} || true
 
 terraform-init: composed-variables bin/terrafile set-azure-account
-	$(if ${DOCKER_IMAGE_TAG}, , $(eval DOCKER_IMAGE_TAG=main))
-
 	./bin/terrafile -p terraform/application/vendor/modules -f terraform/application/config/$(CONFIG)_Terrafile
 	terraform -chdir=terraform/application init -upgrade -reconfigure \
 		-backend-config=resource_group_name=${RESOURCE_GROUP_NAME} \
@@ -65,7 +63,7 @@ terraform-init: composed-variables bin/terrafile set-azure-account
 	$(eval export TF_VAR_config_short=${CONFIG_SHORT})
 	$(eval export TF_VAR_service_name=${SERVICE_NAME})
 	$(eval export TF_VAR_service_short=${SERVICE_SHORT})
-	$(eval export TF_VAR_docker_image=${DOCKER_REPOSITORY}:${DOCKER_IMAGE_TAG})
+	$(eval export TF_VAR_docker_image=${DOCKER_IMAGE})
 
 terraform-plan: terraform-init
 	terraform -chdir=terraform/application plan -var-file "config/${CONFIG}.tfvars.json"