chore: add ARM image build support

.github/workflows/charterafrica-deploy-dev.yml

@@ -2,7 +2,9 @@ name: charterAFRICA | Deploy | DEV
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
     paths:
       - "apps/charterafrica/**"
       - "Dockerfile"
@@ -32,6 +34,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -63,6 +69,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           secrets: |
             "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}"

.github/workflows/charterafrica-deploy-prod.yml

@@ -2,7 +2,9 @@ name: charterAFRICA | Deploy | PROD
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
 
 # This allows a subsequently queued workflow run to interrupt previous runs
 concurrency:
@@ -91,6 +93,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           secrets: |
             "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}"

.github/workflows/civicsignalblog-deploy-prod.yml

@@ -2,7 +2,9 @@ name: CivicSignal Blog | Deploy | PROD
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
 
 # This allows a subsequently queued workflow run to interrupt previous runs
 concurrency:
@@ -31,6 +33,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       # Set up Node since it's required by version-check
       # https://github.com/EndBug/version-check#github-workflow
       - name: Setup Node.js
@@ -84,6 +90,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           secrets: |
             "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}"

.github/workflows/climatemappedafrica-deploy-dev.yml

@@ -2,7 +2,9 @@ name: Climate Mapped Africa | Deploy | DEV
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
     paths:
       - "apps/climatemappedafrica/**"
       - "Dockerfile"
@@ -33,6 +35,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -60,6 +66,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           target: climatemappedafrica-runner
           push: true
           tags: "${{ env.IMAGE_NAME }}:${{ github.sha }}"

.github/workflows/codeforafrica-deploy-dev.yml

@@ -2,7 +2,9 @@ name: Code for Africa | Deploy | DEV
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
     paths:
       - "apps/codeforafrica/**"
       - "Dockerfile"
@@ -34,6 +36,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -66,6 +72,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           secrets: |
             "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}"

.github/workflows/codeforafrica-deploy-prod.yml

@@ -2,7 +2,9 @@ name: Code for Africa | Deploy | PROD
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
 
 # This allows a subsequently queued workflow run to interrupt previous runs
 concurrency:
@@ -32,6 +34,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       # Set up Node since it's required by version-check
       # https://github.com/EndBug/version-check#github-workflow
       - name: Setup Node.js
@@ -87,6 +93,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           secrets: |
             "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}"

.github/workflows/pesayetu-deploy-dev.yml

@@ -34,6 +34,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -68,6 +72,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: "${{ env.IMAGE_NAME }}:${{ github.sha }}"
           target: pesayetu-runner

.github/workflows/roboshield-deploy-dev.yml

@@ -2,7 +2,10 @@ name: RoboShield | Deploy | DEV
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
+
     paths:
       - "apps/roboshield/**"
       - "Dockerfile"
@@ -34,6 +37,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -65,6 +72,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           secrets: |
             "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}"

.github/workflows/roboshield-deploy-prod.yml

@@ -2,7 +2,9 @@ name: RoboShield | Deploy | PROD
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
 
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.ref }}"
@@ -30,6 +32,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
@@ -77,6 +84,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           secrets: |
             "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}"

.github/workflows/vpnmanager-deploy-dev.yml

@@ -2,7 +2,9 @@ name: VPN Manager | Deploy | DEV
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - chore/build-arm-image
     paths:
       - "apps/vpnmanager/**"
       - "Dockerfile.vpnmanager"
@@ -31,6 +33,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Add support for more platforms with QEMU (optional)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -60,6 +66,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           secrets: |
             "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}"

Dockerfile

@@ -702,11 +702,11 @@ COPY apps/roboshield ./apps/roboshield/
 # When building Next.js app, Next.js needs to connect to local Payload
 ENV PAYLOAD_PUBLIC_APP_URL=http://localhost:3000
 RUN --mount=type=secret,id=sentry_auth_token,env=SENTRY_AUTH_TOKEN \
-  pnpm --filter "./apps/roboshield/" build-next
+  pnpm --filter "./apps/roboshield/" build
 
 # When building Payload app, Payload needs to have final app URL
 ENV PAYLOAD_PUBLIC_APP_URL=${NEXT_PUBLIC_APP_URL}
-RUN pnpm --filter "./apps/roboshield/" build-payload
+# RUN pnpm --filter "./apps/roboshield/" build-payload
 
 #
 # roboshield-runner: final deployable image
@@ -729,28 +729,18 @@ RUN set -ex \
 COPY --from=roboshield-builder --chown=nextjs:nodejs /workspace/node_modules ./node_modules
 COPY --from=roboshield-builder --chown=nextjs:nodejs /workspace/apps/roboshield/next.config.js ./apps/roboshield/next.config.js
 COPY --from=roboshield-builder --chown=nextjs:nodejs /workspace/apps/roboshield/.env ./apps/roboshield/.env
-# Since we can't use output: "standalone", copy all app's dependencies
-COPY --from=roboshield-builder --chown=nextjs:nodejs /workspace/apps/roboshield/node_modules ./apps/roboshield/node_modules
 
 # Next.js
 # Public assets
 COPY --from=roboshield-builder --chown=nextjs:nodejs /workspace/apps/roboshield/public ./apps/roboshield/public
-
-# Since we can't use output: "standalone", copy the whole app's .next folder
-# TODO(kilemensi): Figure out which files in .next folder are not needed
-COPY --from=roboshield-builder --chown=nextjs:nodejs /workspace/apps/roboshield/.next ./apps/roboshield/.next
-
-# Payload
-COPY --from=roboshield-builder /workspace/apps/roboshield/dist ./apps/roboshield/dist
-COPY --from=roboshield-builder /workspace/apps/roboshield/build ./apps/roboshield/build
-
-# Since we can't use output: "standalone", switch to specific app's folder
-WORKDIR /workspace/apps/roboshield
+# Copy standalone output
+COPY --from=roboshield-builder --chown=nextjs:nodejs /workspace/apps/roboshield/.next/standalone ./apps/roboshield
+COPY --from=roboshield-builder --chown=nextjs:nodejs /workspace/apps/roboshield/.next/static ./apps/roboshield/.next/static
 
 USER nextjs
 
 # Custom server to run Payload and Next.js in the same app
-CMD ["node", "dist/server.js"]
+CMD ["node", "apps/roboshield/server.js"]
 
 
 # ============================================================================
@@ -986,7 +976,7 @@ CMD ["node", "apps/promisetracker/server.js"]
 #
 # twoopstracker-deps: image with all twoopstracker dependencies
 # ---------------------------------------------------
-  
+
 FROM base-deps AS twoopstracker-deps
 COPY apps/twoopstracker/package.json ./apps/twoopstracker/package.json
 # Use virtual store: https://pnpm.io/cli/fetch#usage-scenario

apps/charterafrica/contrib/dokku/Dockerfile

@@ -1 +1 @@
-FROM codeforafrica/charterafrica-ui:0.1.33
+FROM codeforafrica/charterafrica-ui:0.1.38

apps/charterafrica/package.json

@@ -1,6 +1,6 @@
 {
   "name": "charterafrica",
-  "version": "0.1.33",
+  "version": "0.1.38",
   "private": true,
   "author": "Code for Africa <[email protected]>",
   "description": "This is the official code for https://charter.africa site",

apps/climatemappedafrica/contrib/dokku/Dockerfile

@@ -1 +1 @@
-FROM codeforafrica/climatemapped-africa-ui:0.0.1
+FROM codeforafrica/climatemapped-africa-ui:0.0.5

apps/climatemappedafrica/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climatemappedafrica",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "private": true,
   "author": "Code for Africa <[email protected]>",
   "description": "ClimateMapped Africa",

apps/codeforafrica/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeforafrica",
-  "version": "1.0.56",
+  "version": "1.0.61",
   "private": true,
   "author": "Code for Africa <[email protected]>",
   "description": "This is the main CFA site.",

apps/roboshield/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roboshield",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "private": true,
   "scripts": {
     "build": "next build",

apps/vpnmanager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vpnmanager",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": true,
   "scripts": {
     "dev": "next dev",