diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7fbc118..dacf402 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -31,7 +31,13 @@ jobs: docker push $TAG echo "tag=$TAG" >> $GITHUB_OUTPUT - name: Inline variables in the task definition - run: sed -i -e 's/AWS_ACCOUNT_ID/${{ secrets.AWS_ACCOUNT_ID }}/g' -e 's/AWS_DATABASE_URL_SECRET_NAME/${{ vars.AWS_DATABASE_URL_SECRET_NAME }}/g' -e 's/AWS_EXECUTION_ROLE/${{ vars.AWS_EXECUTION_ROLE }}/g' -e 's/AWS_REGION/${{ vars.AWS_REGION }}/g' task-definition.json + run: > + sed -i + -e 's/AWS_ACCOUNT_ID_PLACEHOLDER/${{ secrets.AWS_ACCOUNT_ID }}/g' + -e 's/AWS_DATABASE_URL_SECRET_NAME_PLACEHOLDER/${{ vars.AWS_DATABASE_URL_SECRET_NAME }}/g' + -e 's/AWS_EXECUTION_ROLE_PLACEHOLDER/${{ vars.AWS_EXECUTION_ROLE }}/g' + -e 's/AWS_REGION_PLACEHOLDER/${{ vars.AWS_REGION }}/g' + task-definition.json - uses: aws-actions/amazon-ecs-render-task-definition@v1.8.4 id: render-task-definition with: diff --git a/task-definition.json b/task-definition.json index 0a01392..59b62be 100644 --- a/task-definition.json +++ b/task-definition.json @@ -1,5 +1,5 @@ { - "executionRoleArn": "AWS_EXECUTION_ROLE", + "executionRoleArn": "AWS_EXECUTION_ROLE_PLACEHOLDER", "containerDefinitions": [ { "name": "atoti-session", @@ -14,7 +14,7 @@ "logDriver": "awslogs", "options": { "awslogs-group": "/ecs/atoti-project-template", - "awslogs-region": "AWS_REGION", + "awslogs-region": "AWS_REGION_PLACEHOLDER", "awslogs-stream-prefix": "ecs" } }, @@ -25,10 +25,19 @@ "containerPort": 80 } ], + "healthCheck": { + "command": [ + "CMD", + "python", + "-c", + "import httpx; httpx.get('http://localhost/actuator/health/readiness').raise_for_status()" + ], + "startPeriod": 30 + }, "secrets": [ { "name": "DATABASE_URL", - "valueFrom": "arn:aws:secretsmanager:AWS_REGION:AWS_ACCOUNT_ID:secret:atoti-project-template/AWS_DATABASE_URL_SECRET_NAME" + "valueFrom": "arn:aws:secretsmanager:AWS_REGION_PLACEHOLDER:AWS_ACCOUNT_ID_PLACEHOLDER:secret:atoti-project-template/AWS_DATABASE_URL_SECRET_NAME_PLACEHOLDER" } ] }