Build multi-arch images in github action and add git to the images.

.github/workflows/docker-image.yml

@@ -13,23 +13,31 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Login to GHCR
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push
+      - name: Build and Push Multi-Architecture Images
         run: |
           repo_owner=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
 
           for file in *.dockerfile; do
             if [ -f "$file" ]; then
               # Extract image name and tag
               image_name=$(basename "$file" | sed -E 's/\.dockerfile//; s/-([^-]+)$/:\1/')
-              # Build and push the image
-              docker build -t ghcr.io/$repo_owner/$image_name -f "$file" .
-              docker push ghcr.io/$repo_owner/$image_name
+              full_image_name="ghcr.io/$repo_owner/$image_name"
+          
+              # Build and push for multiple architectures
+              docker buildx build \
+                --platform linux/amd64,linux/arm64 \
+                -t $full_image_name \
+                -f "$file" \
+                --push .
             fi
           done

webx-dev-env-debian-11.dockerfile

@@ -5,7 +5,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt install -y file cmake dpkg-dev pkg-config
 
 RUN DEBIAN_FRONTEND=noninteractive apt install -y xfce4 xrdp dbus dbus-x11
 RUN DEBIAN_FRONTEND=noninteractive apt install -y xterm terminator nano less
-RUN DEBIAN_FRONTEND=noninteractive apt install -y curl unzip
+RUN DEBIAN_FRONTEND=noninteractive apt install -y curl unzip git
 
 # Ensure webx-engine is mounted to /app
 

webx-dev-env-debian-12.dockerfile

@@ -5,7 +5,7 @@ RUN apt install -y file cmake dpkg-dev pkg-config build-essential libzmq3-dev li
 
 RUN apt install -y xfce4 xrdp dbus dbus-x11
 RUN apt install -y xterm terminator nano less
-RUN apt install -y curl unzip
+RUN apt install -y curl unzip git
 
 # Ensure webx-engine is mounted to /app
 

webx-dev-env-ubuntu-20.04.dockerfile

@@ -5,7 +5,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt install -y file cmake dpkg-dev pkg-config
 
 RUN DEBIAN_FRONTEND=noninteractive apt install -y xfce4 xrdp dbus dbus-x11
 RUN DEBIAN_FRONTEND=noninteractive apt install -y xterm terminator nano less
-RUN DEBIAN_FRONTEND=noninteractive apt install -y curl unzip
+RUN DEBIAN_FRONTEND=noninteractive apt install -y curl unzip git
 
 # Ensure webx-engine is mounted to /app
 

webx-dev-env-ubuntu-22.04.dockerfile

@@ -5,7 +5,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt install -y file cmake dpkg-dev pkg-config
 
 RUN DEBIAN_FRONTEND=noninteractive apt install -y xfce4 xrdp dbus dbus-x11
 RUN DEBIAN_FRONTEND=noninteractive apt install -y xterm terminator nano less
-RUN DEBIAN_FRONTEND=noninteractive apt install -y curl unzip
+RUN DEBIAN_FRONTEND=noninteractive apt install -y curl unzip git
 
 # Ensure webx-engine is mounted to /app
 

webx-dev-env-ubuntu-24.04.dockerfile

@@ -5,7 +5,7 @@ RUN apt install -y file cmake dpkg-dev pkg-config build-essential libzmq3-dev li
 
 RUN apt install -y xfce4 xrdp dbus dbus-x11
 RUN apt install -y xterm terminator nano less
-RUN apt install -y curl unzip
+RUN apt install -y curl unzip git
 
 # Ensure webx-engine is mounted to /app