Merge pull request #23 from e-lemongrab/multi-arch-repo

multi-arch-repo

Author: e-lemongrab

.github/workflows/manual.yml

@@ -87,6 +87,10 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      # Enable QEMU so amd64 runner can build arm64 too
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2  # Set up Docker Buildx for advanced building
 
@@ -102,6 +106,8 @@ jobs:
           context: modules/docker/mongodb  # Path to the directory with the Dockerfile
           file: modules/docker/mongodb/Docker/dockerfile  # Path to the Dockerfile
           push: true  # Push the image to Docker Hub
+          # Multi-arch only for mongodb
+          platforms: linux/amd64,linux/arm64
           tags: ${{ secrets.DOCKER_USERNAME }}/mongodb:latest  # Tag for the Docker image
           build-args: |
             DOCKER_REGISTRY_CACHE=${{ vars.DOCKER_REGISTRY_CACHE }}

.github/workflows/schedule.yml

@@ -94,6 +94,10 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}  # Ensure this secret is set
           password: ${{ secrets.DOCKER_PASSWORD }}  # Ensure this secret is set
 
+      # Enable QEMU so amd64 runner can build arm64 too
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2  # Set up Docker Buildx for advanced building
 
@@ -109,6 +113,8 @@ jobs:
           context: modules/docker/mongodb  # Path to the directory with the Dockerfile
           file: modules/docker/mongodb/Docker/dockerfile  # Path to the Dockerfile
           push: true  # Push the image to Docker Hub
+          # Multi-arch only for mongodb
+          platforms: linux/amd64,linux/arm64
           tags: ${{ secrets.DOCKER_USERNAME }}/mongodb:latest  # Tag for the Docker image
           build-args: |
             DOCKER_REGISTRY_CACHE=${{ vars.DOCKER_REGISTRY_CACHE }}

modules/docker/mongodb/Docker/dockerfile

@@ -1,6 +1,11 @@
 ARG DOCKER_REGISTRY_CACHE
 ARG IMAGE_OPENSUSELEAP
 FROM $DOCKER_REGISTRY_CACHE/$IMAGE_OPENSUSELEAP
+ARG TARGETARCH
+ARG TARGETOS
+ENV TARGETARCH=${TARGETARCH}
+ENV TARGETOS=${TARGETOS}
+
 
 # Expose MongoDB port
 EXPOSE 27017

modules/docker/mongodb/mongodb.bash

@@ -1,4 +1,19 @@
 #!/bin/bash
 cd $project_path/modules/docker/mongodb
-docker compose up -d --build --force-recreate
+case "$1" in
+  arm)
+    echo "[mongodb] Starting in ARM64 mode..."
+    export DOCKER_DEFAULT_PLATFORM=linux/arm64
+    export DOCKER_BUILDKIT=1
+    export COMPOSE_DOCKER_CLI_BUILD=1
+    docker compose up -d --build --force-recreate
+    ;;
+  *)
+    echo "[mongodb] Starting in native amd64 mode..."
+    docker compose up -d --build --force-recreate
+    unset DOCKER_DEFAULT_PLATFORM
+    unset DOCKER_BUILDKIT
+    unset COMPOSE_DOCKER_CLI_BUILD
+    ;;
+esac
 cd