diff --git a/.github/workflows/release-deploy.yml b/.github/workflows/release-deploy.yml index 761ffc8..a9e0697 100644 --- a/.github/workflows/release-deploy.yml +++ b/.github/workflows/release-deploy.yml @@ -7,9 +7,8 @@ on: env: AWS_REGION: us-west-2 - ACCOUNT_ID: 590184104064 + ACCOUNT_ID: "590184104064" ECR_REPOSITORY: popcong-server - REGISTRY: ${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com IMAGE_TAG: ${{ github.sha }} concurrency: @@ -23,6 +22,13 @@ jobs: id-token: write contents: read + env: + AWS_REGION: ${{ env.AWS_REGION }} + ACCOUNT_ID: ${{ env.ACCOUNT_ID }} + ECR_REPOSITORY: ${{ env.ECR_REPOSITORY }} + IMAGE_TAG: ${{ env.IMAGE_TAG }} + REGISTRY: ${{ format('{0}.dkr.ecr.{1}.amazonaws.com', env.ACCOUNT_ID, env.AWS_REGION) }} + steps: - name: Checkout uses: actions/checkout@v4 @@ -56,6 +62,12 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 + env: + AWS_REGION: ${{ env.AWS_REGION }} + ACCOUNT_ID: ${{ env.ACCOUNT_ID }} + ECR_REPOSITORY: ${{ env.ECR_REPOSITORY }} + REGISTRY: ${{ format('{0}.dkr.ecr.{1}.amazonaws.com', env.ACCOUNT_ID, env.AWS_REGION) }} + steps: - name: Connect & Deploy on EC2 uses: appleboy/ssh-action@v1.2.0 @@ -66,10 +78,6 @@ jobs: script: | set -euo pipefail - AWS_REGION="${{ env.AWS_REGION }}" - ACCOUNT_ID="${{ env.ACCOUNT_ID }}" - REGISTRY="${ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com" - echo "[EC2] ECR 로그인" aws ecr get-login-password --region "$AWS_REGION" | docker login --username AWS --password-stdin "$REGISTRY"