@@ -73,42 +73,42 @@ jobs:
73
73
with :
74
74
aws-access-key-id : ${{ secrets.AWS_ACCESS_KEY_ID }}
75
75
aws-secret-access-key : ${{ secrets.AWS_SECRET_ACCESS_KEY }}
76
- aws-region : ${{ env .AWS_REGION }}
76
+ aws-region : ${{ vars .AWS_REGION }}
77
77
78
78
- name : Set up environment
79
79
run : |
80
80
# App Runner deployment will be handled in separate step
81
81
82
82
# Create config file for App Runner deployment script
83
- echo "AWS_ACCOUNT_ID=${{ env .AWS_ACCOUNT_ID }}" > .github/config.env
84
- echo "AWS_REGION=${{ env .AWS_REGION }}" >> .github/config.env
85
- echo "SERVICE_NAME=${{ env .APP_RUNNER_SERVICE }}" >> .github/config.env
86
- echo "ECR_REPOSITORY=${{ env .ECR_REPOSITORY }}" >> .github/config.env
83
+ echo "AWS_ACCOUNT_ID=${{ vars .AWS_ACCOUNT_ID }}" > .github/config.env
84
+ echo "AWS_REGION=${{ vars .AWS_REGION }}" >> .github/config.env
85
+ echo "SERVICE_NAME=${{ vars .APP_RUNNER_SERVICE }}" >> .github/config.env
86
+ echo "ECR_REPOSITORY=${{ vars .ECR_REPOSITORY }}" >> .github/config.env
87
87
88
88
89
89
- name : Build and push Docker image
90
90
run : |
91
91
# Login to ECR
92
- aws ecr get-login-password --region ${{ env .AWS_REGION }} | \
93
- docker login --username AWS --password-stdin ${{ env .AWS_ACCOUNT_ID }}.dkr.ecr.${{ env .AWS_REGION }}.amazonaws.com
92
+ aws ecr get-login-password --region ${{ vars .AWS_REGION }} | \
93
+ docker login --username AWS --password-stdin ${{ vars .AWS_ACCOUNT_ID }}.dkr.ecr.${{ vars .AWS_REGION }}.amazonaws.com
94
94
95
95
# Create ECR repository if it doesn't exist
96
- aws ecr describe-repositories --repository-names ${{ env .ECR_REPOSITORY }} --region ${{ env .AWS_REGION }} || \
97
- aws ecr create-repository --repository-name ${{ env .ECR_REPOSITORY }} --region ${{ env .AWS_REGION }} --image-scanning-configuration scanOnPush=true
96
+ aws ecr describe-repositories --repository-names ${{ vars .ECR_REPOSITORY }} --region ${{ vars .AWS_REGION }} || \
97
+ aws ecr create-repository --repository-name ${{ vars .ECR_REPOSITORY }} --region ${{ vars .AWS_REGION }} --image-scanning-configuration scanOnPush=true
98
98
99
99
# Build from project root with deployment/Dockerfile and data credentials
100
100
docker build -f deployment/Dockerfile \
101
101
--build-arg MXCP_DATA_ACCESS_KEY_ID=${{ secrets.MXCP_DATA_ACCESS_KEY_ID }} \
102
102
--build-arg MXCP_DATA_SECRET_ACCESS_KEY=${{ secrets.MXCP_DATA_SECRET_ACCESS_KEY }} \
103
- -t ${{ env .ECR_REPOSITORY }}:${{ github.sha }} .
103
+ -t ${{ vars .ECR_REPOSITORY }}:${{ github.sha }} .
104
104
105
105
# Tag for ECR
106
- docker tag ${{ env .ECR_REPOSITORY }}:${{ github.sha }} ${{ env .AWS_ACCOUNT_ID }}.dkr.ecr.${{ env .AWS_REGION }}.amazonaws.com/${{ env .ECR_REPOSITORY }}:${{ github.sha }}
107
- docker tag ${{ env .ECR_REPOSITORY }}:${{ github.sha }} ${{ env .AWS_ACCOUNT_ID }}.dkr.ecr.${{ env .AWS_REGION }}.amazonaws.com/${{ env .ECR_REPOSITORY }}:latest
106
+ docker tag ${{ vars .ECR_REPOSITORY }}:${{ github.sha }} ${{ vars .AWS_ACCOUNT_ID }}.dkr.ecr.${{ vars .AWS_REGION }}.amazonaws.com/${{ vars .ECR_REPOSITORY }}:${{ github.sha }}
107
+ docker tag ${{ vars .ECR_REPOSITORY }}:${{ github.sha }} ${{ vars .AWS_ACCOUNT_ID }}.dkr.ecr.${{ vars .AWS_REGION }}.amazonaws.com/${{ vars .ECR_REPOSITORY }}:latest
108
108
109
109
# Push to ECR
110
- docker push ${{ env .AWS_ACCOUNT_ID }}.dkr.ecr.${{ env .AWS_REGION }}.amazonaws.com/${{ env .ECR_REPOSITORY }}:${{ github.sha }}
111
- docker push ${{ env .AWS_ACCOUNT_ID }}.dkr.ecr.${{ env .AWS_REGION }}.amazonaws.com/${{ env .ECR_REPOSITORY }}:latest
110
+ docker push ${{ vars .AWS_ACCOUNT_ID }}.dkr.ecr.${{ vars .AWS_REGION }}.amazonaws.com/${{ vars .ECR_REPOSITORY }}:${{ github.sha }}
111
+ docker push ${{ vars .AWS_ACCOUNT_ID }}.dkr.ecr.${{ vars .AWS_REGION }}.amazonaws.com/${{ vars .ECR_REPOSITORY }}:latest
112
112
113
113
- name : Deploy to AWS App Runner
114
114
run : |
@@ -120,9 +120,9 @@ jobs:
120
120
echo "📊 Monitoring App Runner service creation/update..."
121
121
122
122
# Discover service ARN dynamically by name (ARN changes when service is recreated)
123
- echo "🔍 Finding service ARN for: ${{ env .APP_RUNNER_SERVICE }}"
124
- SERVICE_ARN=$(aws apprunner list-services --region ${{ env .AWS_REGION }} \
125
- --query "ServiceSummaryList[?ServiceName=='${{ env .APP_RUNNER_SERVICE }}'].ServiceArn | [0]" \
123
+ echo "🔍 Finding service ARN for: ${{ vars .APP_RUNNER_SERVICE }}"
124
+ SERVICE_ARN=$(aws apprunner list-services --region ${{ vars .AWS_REGION }} \
125
+ --query "ServiceSummaryList[?ServiceName=='${{ vars .APP_RUNNER_SERVICE }}'].ServiceArn | [0]" \
126
126
--output text)
127
127
128
128
if [ "$SERVICE_ARN" == "None" ] || [ -z "$SERVICE_ARN" ]; then
@@ -176,7 +176,7 @@ jobs:
176
176
177
177
# Get service URL
178
178
SERVICE_URL=$(aws apprunner describe-service \
179
- --service-arn "arn:aws:apprunner:${{ env .AWS_REGION }}:${{ env .AWS_ACCOUNT_ID }}:service/${{ env .APP_RUNNER_SERVICE }}" \
179
+ --service-arn "arn:aws:apprunner:${{ vars .AWS_REGION }}:${{ vars .AWS_ACCOUNT_ID }}:service/${{ vars .APP_RUNNER_SERVICE }}" \
180
180
--query 'Service.ServiceUrl' --output text)
181
181
182
182
echo "🌐 Service URL: https://$SERVICE_URL"
@@ -216,15 +216,15 @@ jobs:
216
216
- name : Deployment summary
217
217
if : always()
218
218
run : |
219
- # Configuration is now in workflow env vars
219
+ # Configuration from GitHub variables
220
220
221
221
echo "## 🚀 Deployment Summary" >> $GITHUB_STEP_SUMMARY
222
- echo "- **Service**: $SERVICE_NAME " >> $GITHUB_STEP_SUMMARY
223
- echo "- **Region**: $AWS_REGION" >> $GITHUB_STEP_SUMMARY
222
+ echo "- **Service**: ${{ vars.APP_RUNNER_SERVICE }} " >> $GITHUB_STEP_SUMMARY
223
+ echo "- **Region**: ${{ vars. AWS_REGION }} " >> $GITHUB_STEP_SUMMARY
224
224
echo "- **Environment**: ${{ github.event.inputs.environment || 'production' }}" >> $GITHUB_STEP_SUMMARY
225
225
226
226
# Get service URL if deployment succeeded
227
- if SERVICE_URL=$(aws apprunner describe-service --service-arn "arn:aws:apprunner:${AWS_REGION} :${AWS_ACCOUNT_ID} :service/${SERVICE_NAME }" --query 'Service.ServiceUrl' --output text 2>/dev/null); then
227
+ if SERVICE_URL=$(aws apprunner describe-service --service-arn "arn:aws:apprunner:${{ vars. AWS_REGION }} :${{ vars. AWS_ACCOUNT_ID }} :service/${{ vars.APP_RUNNER_SERVICE } }" --query 'Service.ServiceUrl' --output text 2>/dev/null); then
228
228
echo "- **Service URL**: https://$SERVICE_URL" >> $GITHUB_STEP_SUMMARY
229
229
echo "- **MCP Endpoint**: https://$SERVICE_URL/mcp" >> $GITHUB_STEP_SUMMARY
230
230
fi
0 commit comments