Unified aarch64 / amd64 image

helpers/docker-helpers.sh

@@ -1,6 +1,5 @@
 # Docker helper functions for Omarchy package build system
 
-# Check Docker is available and running
 check_docker() {
   if ! command -v docker &>/dev/null; then
     print_error "Docker is not installed"
@@ -14,26 +13,31 @@ check_docker() {
   fi
 }
 
-# Build the Docker image if needed
 build_docker_image() {
   local build_dir="$1"
   local arch="${2:-x86_64}"
-  local dockerfile="$build_dir/Dockerfile.$arch"
   local platform=""
   local image_tag="omarchy-pkg-builder:latest-$arch"
   
-  # Set platform for Docker build
-  if [[ "$arch" == "aarch64" ]]; then
-    platform="--platform linux/arm64"
-  elif [[ "$arch" == "x86_64" ]]; then
-    platform="--platform linux/amd64"
-  fi
+  case "$arch" in
+    x86_64)  platform="linux/amd64" ;;
+    aarch64) platform="linux/arm64" ;;
+    *)
+      print_error "Unsupported architecture: $arch"
+      exit 1
+      ;;
+  esac
   
-  print_info "Building Docker image for $arch..."
-  docker build $platform -t "$image_tag" -f "$dockerfile" "$build_dir"
+  print_info "Building Docker image for $arch ($platform)..."
+  
+  docker buildx build \
+    --platform "$platform" \
+    --load \
+    -t "$image_tag" \
+    -f "$build_dir/Dockerfile" \
+    "$build_dir"
 }
 
-# Make directory writable by Docker container user
 make_dir_writable() {
   local dir="$1"
   if [ "$(id -u)" -eq 0 ]; then
@@ -42,22 +46,3 @@ make_dir_writable() {
     sudo chown -R $(id -u):$(id -g) "$dir" 2>/dev/null || chmod -R 777 "$dir"
   fi
 }
-
-# Run a Docker container with standard setup
-run_docker() {
-  local script="$1"
-  local arch="${2:-x86_64}"
-  shift 2
-  local -a args=("$@")
-  local image_tag="omarchy-pkg-builder:latest-$arch"
-  local platform=""
-  
-  # Set platform for Docker run
-  if [[ "$arch" == "aarch64" ]]; then
-    platform="--platform linux/arm64"
-  elif [[ "$arch" == "x86_64" ]]; then
-    platform="--platform linux/amd64"
-  fi
-  
-  docker run --rm $platform "${args[@]}" "$image_tag" "$script"
-}