diff --git a/.github/workflows/auth.release.dev.yml b/.github/workflows/auth.release.yml similarity index 61% rename from .github/workflows/auth.release.dev.yml rename to .github/workflows/auth.release.yml index 61d6e2109..e6ece4d0e 100644 --- a/.github/workflows/auth.release.dev.yml +++ b/.github/workflows/auth.release.yml @@ -1,14 +1,13 @@ -name: Auth Server Dev +name: Auth Server concurrency: - group: auth_dev_environment + group: auth cancel-in-progress: true on: push: tags: - - '@standardnotes/auth-server@[0-9]*.[0-9]*.[0-9]*-alpha.[0-9]*' - - '@standardnotes/auth-server@[0-9]*.[0-9]*.[0-9]*-beta.[0-9]*' + - '*standardnotes/auth-server*' workflow_dispatch: jobs: @@ -50,8 +49,8 @@ jobs: run: | yarn docker build @standardnotes/auth-server -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG - docker tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG $ECR_REGISTRY/$ECR_REPOSITORY:dev - docker push $ECR_REGISTRY/$ECR_REPOSITORY:dev + docker tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG $ECR_REGISTRY/$ECR_REPOSITORY:latest + docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest publish-docker-hub: needs: test @@ -71,8 +70,8 @@ jobs: run: | yarn docker build @standardnotes/auth-server -t standardnotes/auth:${{ github.sha }} docker push standardnotes/auth:${{ github.sha }} - docker tag standardnotes/auth:${{ github.sha }} standardnotes/auth:dev - docker push standardnotes/auth:dev + docker tag standardnotes/auth:${{ github.sha }} standardnotes/auth:latest + docker push standardnotes/auth:latest deploy-web: needs: publish-aws-ecr @@ -86,26 +85,46 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 - - name: Download task definition + - name: DEV - Download task definition run: | aws ecs describe-task-definition --task-definition auth-dev --query taskDefinition > task-definition.json - - name: Fill in the new version in the Amazon ECS task definition + - name: DEV - Fill in the new version in the Amazon ECS task definition run: | jq '(.containerDefinitions[] | select(.name=="auth-dev") | .environment[] | select(.name=="VERSION")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json - - name: Fill in the new image ID in the Amazon ECS task definition - id: task-def + - name: DEV - Fill in the new image ID in the Amazon ECS task definition + id: task-def-dev uses: aws-actions/amazon-ecs-render-task-definition@v1 with: task-definition: task-definition.json container-name: auth-dev image: ${{ secrets.AWS_ECR_REGISTRY }}/auth:${{ github.sha }} - - name: Deploy Amazon ECS task definition + - name: DEV - Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: ${{ steps.task-def.outputs.task-definition }} + task-definition: ${{ steps.task-def-dev.outputs.task-definition }} service: auth-dev cluster: dev wait-for-service-stability: true + - name: PROD - Download task definition + run: | + aws ecs describe-task-definition --task-definition auth-prod --query taskDefinition > task-definition.json + - name: PROD - Fill in the new version in the Amazon ECS task definition + run: | + jq '(.containerDefinitions[] | select(.name=="auth-prod") | .environment[] | select(.name=="VERSION")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json + - name: PROD - Fill in the new image ID in the Amazon ECS task definition + id: task-def-prod + uses: aws-actions/amazon-ecs-render-task-definition@v1 + with: + task-definition: task-definition.json + container-name: auth-prod + image: ${{ secrets.AWS_ECR_REGISTRY }}/auth:${{ github.sha }} + - name: PROD - Deploy Amazon ECS task definition + uses: aws-actions/amazon-ecs-deploy-task-definition@v1 + with: + task-definition: ${{ steps.task-def-prod.outputs.task-definition }} + service: auth-prod + cluster: prod + wait-for-service-stability: true deploy-worker: needs: publish-aws-ecr @@ -119,26 +138,46 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 - - name: Download task definition + - name: DEV - Download task definition run: | aws ecs describe-task-definition --task-definition auth-worker-dev --query taskDefinition > task-definition.json - - name: Fill in the new version in the Amazon ECS task definition + - name: DEV - Fill in the new version in the Amazon ECS task definition run: | jq '(.containerDefinitions[] | select(.name=="auth-worker-dev") | .environment[] | select(.name=="VERSION")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json - - name: Fill in the new image ID in the Amazon ECS task definition - id: task-def + - name: DEV - Fill in the new image ID in the Amazon ECS task definition + id: task-def-dev uses: aws-actions/amazon-ecs-render-task-definition@v1 with: task-definition: task-definition.json container-name: auth-worker-dev image: ${{ secrets.AWS_ECR_REGISTRY }}/auth:${{ github.sha }} - - name: Deploy Amazon ECS task definition + - name: DEV - Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: ${{ steps.task-def.outputs.task-definition }} + task-definition: ${{ steps.task-def-dev.outputs.task-definition }} service: auth-worker-dev cluster: dev wait-for-service-stability: true + - name: PROD - Download task definition + run: | + aws ecs describe-task-definition --task-definition auth-worker-prod --query taskDefinition > task-definition.json + - name: PROD - Fill in the new version in the Amazon ECS task definition + run: | + jq '(.containerDefinitions[] | select(.name=="auth-worker-prod") | .environment[] | select(.name=="VERSION")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json + - name: PROD - Fill in the new image ID in the Amazon ECS task definition + id: task-def-prod + uses: aws-actions/amazon-ecs-render-task-definition@v1 + with: + task-definition: task-definition.json + container-name: auth-worker-prod + image: ${{ secrets.AWS_ECR_REGISTRY }}/auth:${{ github.sha }} + - name: PROD - Deploy Amazon ECS task definition + uses: aws-actions/amazon-ecs-deploy-task-definition@v1 + with: + task-definition: ${{ steps.task-def-prod.outputs.task-definition }} + service: auth-worker-prod + cluster: prod + wait-for-service-stability: true newrelic: needs: [ deploy-web, deploy-worker ] @@ -150,7 +189,7 @@ jobs: with: accountId: ${{ secrets.NEW_RELIC_ACCOUNT_ID }} apiKey: ${{ secrets.NEW_RELIC_API_KEY }} - applicationId: ${{ secrets.NEW_RELIC_APPLICATION_ID_AUTH_WEB_DEV }} + applicationId: ${{ secrets.NEW_RELIC_APPLICATION_ID_AUTH_WEB_PROD }} revision: "${{ github.sha }}" description: "Automated Deployment via Github Actions" user: "${{ github.actor }}" @@ -159,7 +198,7 @@ jobs: with: accountId: ${{ secrets.NEW_RELIC_ACCOUNT_ID }} apiKey: ${{ secrets.NEW_RELIC_API_KEY }} - applicationId: ${{ secrets.NEW_RELIC_APPLICATION_ID_AUTH_WORKER_DEV }} + applicationId: ${{ secrets.NEW_RELIC_APPLICATION_ID_AUTH_WORKER_PROD }} revision: "${{ github.sha }}" description: "Automated Deployment via Github Actions" user: "${{ github.actor }}"