Merge pull request #266 from RockefellerArchiveCenter/development

dependency and deploy updates from Development

Author: ioduok

.github/workflows/dependencies.yml

@@ -20,7 +20,7 @@ jobs:
           ref: development
 
       - name: Set up Python
-        uses: actions/setup-python@v5.4.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: '3.11'
           cache: pip
@@ -52,7 +52,7 @@ jobs:
 
       - name: Create Pull Request
         if: always()
-        uses: peter-evans/create-pull-request@v7.0.7
+        uses: peter-evans/create-pull-request@v7.0.8
         with:
           token: ${{ secrets.ACCESS_TOKEN }}
           branch: dependency-updates

.github/workflows/deploy.yml

@@ -37,38 +37,31 @@ jobs:
         with:
           registries: ${{ secrets.ECR_REGISTRIES }}
 
-      - name: Set environment variables
+      - name: Set environment variable for current date
         run: |
           echo "DATE=$(date +'%Y%m%dT%H%M%S')" >> $GITHUB_ENV
 
       - name: Copy config file
         run: cp theme/_config.yml.example theme/config.yml
-      
-      - name: Build Docker image
-        run: docker build -t ${{ env.APP_NAME }} .
 
-      - name: Tag and push latest to ECR
-        if: github.ref == 'refs/heads/base'
-        run: |
-          docker tag ${{ env.APP_NAME }} "${{ secrets.AWS_ACCOUNT_ID }}".dkr.ecr."${{ secrets.AWS_REGION }}".amazonaws.com/"${{ env.APP_NAME }}":latest
-          docker push "${{ secrets.AWS_ACCOUNT_ID }}".dkr.ecr."${{ secrets.AWS_REGION }}".amazonaws.com/"${{ env.APP_NAME }}":latest
-      - name: Tag and push dev to ECR
+      - name: Build and push Docker images with dev and versioned tags
         if: github.ref == 'refs/heads/development'
         run: |
+          docker build -t ${{ env.APP_NAME }}  .
           docker tag ${{ env.APP_NAME }} "${{ secrets.AWS_ACCOUNT_ID }}".dkr.ecr."${{ secrets.AWS_REGION }}".amazonaws.com/"${{ env.APP_NAME }}":dev
           docker push "${{ secrets.AWS_ACCOUNT_ID }}".dkr.ecr."${{ secrets.AWS_REGION }}".amazonaws.com/"${{ env.APP_NAME }}":dev
-      - name: Tag and push versioned image to ECR
-        if: github.ref == 'refs/heads/development'
-        run: |
           docker tag ${{ env.APP_NAME }} "${{ secrets.AWS_ACCOUNT_ID }}".dkr.ecr."${{ secrets.AWS_REGION }}".amazonaws.com/"${{ env.APP_NAME }}":"${{ env.DATE }}"-"${{ github.sha }}"
           docker push "${{ secrets.AWS_ACCOUNT_ID }}".dkr.ecr."${{ secrets.AWS_REGION }}".amazonaws.com/"${{ env.APP_NAME }}":"${{ env.DATE }}"-"${{ github.sha }}"
-      - name: Tag image for production (base branch)
+  
+      - name: Add prod and latest tags to images
         if: github.ref == 'refs/heads/base'
         run: |
           MANIFEST=$(aws ecr batch-get-image --registry-id ${{ secrets.AWS_ACCOUNT_ID }} --repository-name ${{ env.APP_NAME }} --image-ids imageTag=dev --output json | jq -c --join-output '.images[0].imageManifest')
           aws ecr put-image --registry-id ${{ secrets.AWS_ACCOUNT_ID }} --repository-name ${{ env.APP_NAME }} --image-tag prod --image-manifest "$MANIFEST"
+          aws ecr put-image --registry-id ${{ secrets.AWS_ACCOUNT_ID }} --repository-name ${{ env.APP_NAME }} --image-tag latest --image-manifest "$MANIFEST"
+          
       - name: Deploy lambda
         if: github.ref == 'refs/heads/base'
         run: aws lambda update-function-code
           --function-name arn:aws:lambda:$AWS_REGION:${{ secrets.AWS_ACCOUNT_ID }}:function:$LAMBDA_NAME
-          --image-uri ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/${{ env.APP_NAME }}:prod
+          --image-uri ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/${{ env.APP_NAME }}:prod

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ repos:
       - --in-place
       - --aggressive
 - repo: https://github.com/pycqa/flake8
-  rev: 7.1.2
+  rev: 7.2.0
   hooks:
   - id: flake8
 - repo: https://github.com/pycqa/isort

requirements.txt

@@ -4,9 +4,9 @@
 #
 #    pip-compile
 #
-boto3==1.37.5
+boto3==1.37.24
     # via -r requirements.in
-botocore==1.37.5
+botocore==1.37.24
     # via
     #   boto3
     #   s3transfer
@@ -18,7 +18,7 @@ python-dateutil==2.9.0.post0
     # via botocore
 pyyaml==6.0.2
     # via -r requirements.in
-s3transfer==0.11.3
+s3transfer==0.11.4
     # via boto3
 six==1.17.0
     # via python-dateutil