Fix merge conflicts

.github/workflows/ecr.yml

@@ -0,0 +1,55 @@
+name: AWS ECR
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
+    strategy:
+      matrix:
+        task: [api, data, pmtiles, hooks, events]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{github.event.pull_request.head.sha || github.sha}}
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws-us-gov:iam::${{secrets.AWS_ACCOUNT_ID}}:role/Github-ECR-Builder
+          role-session-name: GithubECRBuilder
+          aws-region: ${{secrets.AWS_REGION}}
+
+      - name: Docker Build Task
+        run: npm run build -- ${{matrix.task}}
+        env:
+          AWS_ACCOUNT_ID: ${{secrets.AWS_ACCOUNT_ID}}
+          AWS_REGION: ${{secrets.AWS_REGION}}
+
+      - name: Configure AWS Credentials (STAGING)
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::${{secrets.AWS_STAGING_ACCOUNT_ID}}:role/Github-ECR-Builder
+          role-session-name: GithubECRBuilder
+          aws-region: ${{secrets.AWS_STAGING_REGION}}
+
+      - name: Docker Build Task (STAGING)
+        run: npm run build -- ${{matrix.task}}
+        env:
+          AWS_ACCOUNT_ID: ${{secrets.AWS_STAGING_ACCOUNT_ID}}
+          AWS_REGION: ${{secrets.AWS_STAGING_REGION}}
+

CHANGELOG.md

@@ -12,6 +12,17 @@
 
 ### Pending Release
 
+### v4.9.0 - 2024-10-09
+
+- :rocket: `DevOps` Add top level build script for pushing ECR Images to given AWS account
+- :rocket: `DevOps` Switch GH Actions to use new build pipeline
+
+### v4.8.0 - 2024-10-09
+
+- :rocket: `UI` Hide CoTView properties with no values
+- :rocket: `UI` Allow adding properties such as Video/Sensor/Attachment via a 3 dot button
+- :tada: `UI` Support editing Sensor values in CoTView (Still not viewable on map)
+
 ### v4.7.0 - 2024-10-07
 
 - :rocket: `UI/API` Add initial configuration mode