Merge pull request #720 from NASA-AMMOS/jr-652

Added multi-platform build to support arm64 architecture

Author: jtroberts

.github/workflows/docker-build.yml

@@ -30,17 +30,20 @@ env:
   IMAGE_SLUG: ${{ github.repository }}
 
 jobs:
-  # Push image to GitHub Container Registry.
+  # Generate shared tags for both architectures
   # The image tag pattern is:
   # for pull-requests: <PATCH_VERSION>-<DATE>-<PR_NUMBER>, eg: 1.35.2-20210125-25
   # for tags: <TAG>
   # for `master` branch: latest,<PATCH_VERSION>-latest,<MINOR_VERSION>-latest,<MAJOR_VERSION>-latest,<PATCH_VERSION>-<DATE>-<SHA>
   # for `development` branch: development,<MAJOR_VERSION>-development,<PATCH_VERSION>-<DATE>-<SHA>
   # for releases: release,<PATCH_VERSION>-release,<MINOR_VERSION>-release,<MAJOR_VERSION>-release,<PATCH_VERSION>-<DATE>-<SHA>
   # Version is parsed from package.json
-  push:
+  generate-tags:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'release'
+    outputs:
+      registry-tags: ${{ steps.generate.outputs.REGISTRY_TAGS }}
+      image-id: ${{ steps.generate.outputs.IMAGE_ID }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -83,13 +86,13 @@ jobs:
           [ "$VERSION" == "development" ] && VERSION=development
           [ "${{ github.event_name }}" == "release" ] && VERSION=release
 
-          # Compose REGISTRY_TAGS variable
-          REGISTRY_TAGS="-t $IMAGE_ID:$VERSION"
+          # Compose REGISTRY_TAGS variable for buildx (space-separated with --tag flags)
+          REGISTRY_TAGS="--tag $IMAGE_ID:$VERSION"
 
           # For master branch also supply an extra tag: <PATCH_VERSION>-latest,<MINOR_VERSION>-latest,<MAJOR_VERSION>-latest,<PATCH_VERSION>-<DATE>-<SHA>
-          [ "$VERSION" == "latest" ] && REGISTRY_TAGS="$REGISTRY_TAGS -t $IMAGE_ID:$PATCH_VERSION-latest -t $IMAGE_ID:$MINOR_VERSION-latest -t $IMAGE_ID:$MAJOR_VERSION-latest -t $IMAGE_ID:$PATCH_VERSION-$BDATE-$(git rev-parse --short HEAD)"
-          [ "$VERSION" == "development" ] && REGISTRY_TAGS="$REGISTRY_TAGS -t $IMAGE_ID:$MAJOR_VERSION-development -t $IMAGE_ID:$PATCH_VERSION-$BDATE-$(git rev-parse --short HEAD)"
-          [ "$VERSION" == "release" ] && REGISTRY_TAGS="$REGISTRY_TAGS -t $IMAGE_ID:$PATCH_VERSION-release -t $IMAGE_ID:$MINOR_VERSION-release -t $IMAGE_ID:$MAJOR_VERSION-release -t $IMAGE_ID:$PATCH_VERSION-$BDATE-$(git rev-parse --short HEAD)"
+          [ "$VERSION" == "latest" ] && REGISTRY_TAGS="$REGISTRY_TAGS --tag $IMAGE_ID:$PATCH_VERSION-latest --tag $IMAGE_ID:$MINOR_VERSION-latest --tag $IMAGE_ID:$MAJOR_VERSION-latest --tag $IMAGE_ID:$PATCH_VERSION-$BDATE-$(git rev-parse --short HEAD)"
+          [ "$VERSION" == "development" ] && REGISTRY_TAGS="$REGISTRY_TAGS --tag $IMAGE_ID:$MAJOR_VERSION-development --tag $IMAGE_ID:$PATCH_VERSION-$BDATE-$(git rev-parse --short HEAD)"
+          [ "$VERSION" == "release" ] && REGISTRY_TAGS="$REGISTRY_TAGS --tag $IMAGE_ID:$PATCH_VERSION-release --tag $IMAGE_ID:$MINOR_VERSION-release --tag $IMAGE_ID:$MAJOR_VERSION-release --tag $IMAGE_ID:$PATCH_VERSION-$BDATE-$(git rev-parse --short HEAD)"
 
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
@@ -99,19 +102,58 @@ jobs:
           SHA_SHORT=${{ github.sha }}
           [ "${{ github.event_name }}" == "pull_request" ] && SHA_SHORT=$(echo ${{ github.event.pull_request.head.sha }} | cut -c1-8)
 
-          echo "Final image tag to be pushed:"
+          echo "Final image tags to be pushed:"
           echo $REGISTRY_TAGS
           echo "REGISTRY_TAGS=$REGISTRY_TAGS" >> $GITHUB_OUTPUT
           echo "IMAGE_ID=$IMAGE_ID" >> $GITHUB_OUTPUT
           echo "REGISTRY_TAGS_VERSION=$VERSION" >> $GITHUB_OUTPUT
           echo "REGISTRY_TAGS_PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT
           echo "SHA_SHORT=$SHA_SHORT" >> $GITHUB_OUTPUT
 
+  # Build and push AMD64 image on x64 runner
+  build-amd64:
+    needs: generate-tags
+    runs-on: ubuntu-latest  # x64 runner for native AMD64 builds
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to GHCR
         run: echo ${{ secrets.GITHUB_TOKEN }} | docker login -u ${{ github.actor }} --password-stdin ghcr.io
 
-      - name: Docker build
-        run: docker build --no-cache ${{ steps.generate.outputs.REGISTRY_TAGS }} .
+      - name: Docker buildx build and push (AMD64)
+        run: |
+          docker buildx build \
+            --platform linux/amd64 \
+            ${{ needs.generate-tags.outputs.registry-tags }} \
+            --push \
+            --no-cache \
+            .
+
+  # Build and push ARM64 image on ARM64 runner
+  build-arm64:
+    needs: generate-tags
+    runs-on: ubuntu-24.04-arm  # ARM64 runner for native ARM64 builds
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Docker push
-        run: docker push ${{ steps.generate.outputs.IMAGE_ID }} --all-tags
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GHCR
+        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login -u ${{ github.actor }} --password-stdin ghcr.io
+
+      - name: Docker buildx build and push (ARM64)
+        run: |
+          # Generate ARM64-specific tags by adding -arm64 suffix
+          ARM64_TAGS="${{ needs.generate-tags.outputs.registry-tags }}-arm64"
+          docker buildx build \
+            --platform linux/arm64 \
+            ${ARM64_TAGS} \
+            --push \
+            --no-cache \
+            .

Dockerfile

@@ -15,15 +15,28 @@ WORKDIR /usr/src/app
 # Bundle app source
 COPY . .
 
-
 #############################
 # Python
 #############################
 
-# micromamba
-RUN dnf install -y bzip2
+# Use build arguments to detect target platform (default to amd64 if not provided)
+ARG TARGETPLATFORM
+ARG TARGETARCH
+
+# micromamba - Platform-specific download
+RUN dnf install -y bzip2 curl
 RUN mkdir -p /opt/micromamba/bin
-RUN curl -Ls https://micro.mamba.pm/api/micromamba/linux-64/latest | tar -C /opt/micromamba -xvj bin/micromamba
+
+# Download correct micromamba binary based on architecture
+RUN MICROMAMBA_URL="https://micro.mamba.pm/api/micromamba/linux-64/latest" && \
+    if [ "${TARGETARCH}" = "arm64" ]; then \
+        MICROMAMBA_URL="https://micro.mamba.pm/api/micromamba/linux-aarch64/latest"; \
+    elif [ -z "${TARGETARCH}" ]; then \
+        echo "TARGETARCH is empty, defaulting to amd64"; \
+    fi && \
+    echo "Downloading micromamba for ${TARGETARCH} from: ${MICROMAMBA_URL}" && \
+    curl -Ls "${MICROMAMBA_URL}" | tar -C /opt/micromamba -xvj bin/micromamba
+
 RUN MAMBA_ROOT_PREFIX="/opt/micromamba"; /opt/micromamba/bin/micromamba shell init -s bash
 RUN echo 'export PATH="/opt/micromamba/bin:$PATH"' >> /root/.bashrc && echo 'export MAMBA_ROOT_PREFIX="/opt/micromamba"' >> /root/.bashrc
 
@@ -35,7 +48,6 @@ RUN source ~/.bashrc && micromamba env create -y --name mmgis --file=python-envi
 
 RUN dnf module install nodejs:20
 
-
 #############################
 # MMGIS
 #############################
@@ -45,7 +57,6 @@ RUN npm install
 # build
 RUN npm run build
 
-
 #############################
 # MMGIS Configure
 #############################
@@ -60,12 +71,8 @@ RUN npm install
 # Build Configure Site
 RUN npm run build
 
-##
-
 WORKDIR /usr/src/app/
 
-# 
-
 RUN chmod 755 _docker-entrypoint.sh
 
 EXPOSE 8888

python-environment.yml

@@ -4,6 +4,9 @@ channels:
 dependencies:
   - python==3.12
   - gdal==3.9.3
+  - rasterio
+  - geos
+  - proj
   - pip
   - pip:
       - numpy==2.1.0