From 495179c41caa2f1646322c581891a1e3ecc14a79 Mon Sep 17 00:00:00 2001
From: Erik Jaegervall <erik.jaegervall@se.bosch.com>
Date: Thu, 27 Jun 2024 14:57:48 +0200
Subject: [PATCH] Update instructions for cross compilation

Also removing unused file
---
 doc/docker.md   |  11 +++++-
 docker-build.sh | 102 ------------------------------------------------
 2 files changed, 10 insertions(+), 103 deletions(-)
 delete mode 100755 docker-build.sh

diff --git a/doc/docker.md b/doc/docker.md
index 34d197b..ba97d77 100644
--- a/doc/docker.md
+++ b/doc/docker.md
@@ -3,7 +3,7 @@
 It is possible to build can-provider as a Docker container
 
 ```console
-docker build -f Dockerfile --progress=plain --build-arg TARGETPLATFORM=linux/amd64 -t can-provider:latest .
+docker build -f Dockerfile --progress=plain -t can-provider:latest .
 ```
 
 The same container can be used for both connecting to Databroker and Server:
@@ -14,6 +14,15 @@ docker run  --net=host -e LOG_LEVEL=INFO can-provider:latest --server-type kuksa
 docker run  --net=host -e LOG_LEVEL=INFO can-provider:latest --server-type kuksa_val_server
 ```
 
+## Building for a different architecture
+
+You can build for a different architecture by using `buildx`and the `--platform` argument.
+You might need to install `qemu-user-static` depending on your distribution.
+
+```console
+docker buildx build -f Dockerfile --progress=plain --platform=linux/arm64 -t can-provider:latest .
+```
+
 ## Pre-built Docker container
 
 A pre-built Docker container is available in the repository. The container is availablat the github container registry via
diff --git a/docker-build.sh b/docker-build.sh
deleted file mode 100755
index 37ac45a..0000000
--- a/docker-build.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-#********************************************************************************
-# Copyright (c) 2022 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Apache License 2.0 which is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# SPDX-License-Identifier: Apache-2.0
-#*******************************************************************************/
-# shellcheck disable=SC2181
-# shellcheck disable=SC2086
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-CONTEXT_DIR="$SCRIPT_DIR"
-# name of docker image: ${DOCKER_ARCH)/${DOCKER_IMAGE}
-DOCKER_IMAGE="feeder_can"
-
-print_usage() {
-	echo "USAGE: $0 [OPTIONS] TARGETS"
-	echo
-	echo "Standalone build helper for $DOCKER_IMAGE docker image."
-	echo
-	echo "OPTIONS:"
-	echo "  -l, --local      local docker import (does not export tar)"
-	echo "  -v, --verbose    enable plain docker output and disable cache"
-	echo "      --help       show help"
-	echo
-	echo "TARGETS:"
-	echo "  x86_64|amd64, aarch64|amd64    Target arch to build for, if not set - defaults to multiarch"
-	echo
-}
-
-LOCAL=0
-VERBOSE=0
-while [ $# -gt 0 ]; do
-	if [ "$1" = "--local" ] || [ "$1" = "-l" ]; then
-		LOCAL=1
-	elif [ "$1" = "--verbose" ] || [ "$1" = "-v" ]; then
-		VERBOSE=1
-	elif [ "$1" = "--help" ]; then
-		print_usage
-		exit 0
-	else
-		TARGET="$1"
-	fi
-	shift
-done
-
-target_arch() {
-	local target="$1"
-	case "$target" in
-	"x86_64" | "amd64")
-		echo "amd64"
-		;;
-	"arm64" | "aarch64")
-		echo "arm64"
-		;;
-	"armv6" | "arm")
-		echo "arm/v6"
-		;;
-	"multiarch" | "")
-		echo "multiarch"
-		;;
-	*)
-		return 1
-		;;
-	esac
-	return 0
-}
-
-if [ -z "$TARGET" ] && [ $LOCAL -eq 1 ]; then
-	echo "Multiarch archives are not supported for local builds, removing --local flag ..."
-	LOCAL=0
-fi
-
-DOCKER_ARCH=$(target_arch "$TARGET")
-DOCKER_EXPORT="./${DOCKER_ARCH//\//_}-${DOCKER_IMAGE}.tar"
-
-if [ "$DOCKER_ARCH" = "multiarch" ]; then
-	DOCKER_ARGS="--platform linux/amd64,linux/arm64 -t $DOCKER_ARCH/$DOCKER_IMAGE --output type=oci,dest=$DOCKER_EXPORT"
-else
-	if [ $LOCAL -eq 1 ]; then
-		DOCKER_ARGS="--load -t $DOCKER_ARCH/$DOCKER_IMAGE"
-		docker image tag $DOCKER_ARCH/$DOCKER_IMAGE ghcr.io/softwaredefinedvehicle/swdc-os-vehicleapi/canfeeder:prerelease
-		DOCKER_EXPORT="(local)"
-	else
-		DOCKER_ARGS="--platform linux/$DOCKER_ARCH -t $DOCKER_ARCH/$DOCKER_IMAGE --output type=oci,dest=$DOCKER_EXPORT"
-	fi
-fi
-
-if [ "$VERBOSE" = "1" ]; then
-	DOCKER_ARGS="--no-cache --progress=plain $DOCKER_ARGS"
-fi
-
-cd "$CONTEXT_DIR" || exit 1
-echo "# docker buildx build $DOCKER_ARGS -f Dockerfile $CONTEXT_DIR"
-DOCKER_BUILDKIT=1 docker buildx build $DOCKER_ARGS -f Dockerfile "$CONTEXT_DIR" $DOCKER_EXT
-[ $? -eq 0 ] && echo "# Exported $DOCKER_ARCH/$DOCKER_IMAGE in $DOCKER_EXPORT"