Pass arch flag

LecrisUT · Oct 9, 2024 · 7c5be02 · 7c5be02 · martin-g · Oct 9, 2024
1 parent d01e021
commit 7c5be02
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/run-on-arch.js b/src/run-on-arch.js
@@ -126,7 +126,7 @@ async function main() {
   console.log('Configuring Docker for multi-architecture support');
   await exec(
     path.join(__dirname, 'run-on-arch.sh'),
-    [ dockerFile, containerName, ...dockerRunArgs ],
+    [ arch, dockerFile, containerName, ...dockerRunArgs ],
     { env },
   );
 }

diff --git a/src/run-on-arch.sh b/src/run-on-arch.sh
@@ -3,17 +3,23 @@
 set -euo pipefail
 
 # Args
-DOCKERFILE=$1
-CONTAINER_NAME=$2
+ARCH=$1
+DOCKERFILE=$2
+CONTAINER_NAME=$3
 # Remainder of args get passed to docker
-declare -a DOCKER_RUN_ARGS=${@:3:${#@}}
+declare -a DOCKER_RUN_ARGS=${@:4:${#@}}
 
 # Defaults
 ACTION_DIR="$(cd "$(dirname "$0")"/.. >/dev/null 2>&1 ; pwd -P)"
 LOWERCASE_REPOSITORY=$(printf "%s" "$GITHUB_REPOSITORY" | tr '[:upper:]' '[:lower:]')
 PACKAGE_REGISTRY="ghcr.io/${LOWERCASE_REPOSITORY}/${CONTAINER_NAME}"
 DEBIAN_FRONTEND=noninteractive
 
+# Sanitize inputs
+if [[ "$ARCH" == "none" ]]; then
+  unset ARCH
+fi
+
 show_build_log_and_exit () {
   # Show build-log.text output and exit if passed exit status != 0
   status=$1
@@ -49,6 +55,7 @@ build_container () {
   then
     docker build \
       "${ACTION_DIR}/Dockerfiles" \
+      ${ARCH:+--platform=linux/$ARCH} \
       --file "$DOCKERFILE" \
       --tag "${CONTAINER_NAME}:latest"
   else
@@ -70,6 +77,7 @@ build_container () {
     docker pull "$PACKAGE_REGISTRY:latest" || true
     docker build \
       "${ACTION_DIR}/Dockerfiles" \
+      ${ARCH:+--platform=linux/$ARCH} \
       --file "$DOCKERFILE" \
       --tag "${CONTAINER_NAME}:latest" \
       --cache-from="$PACKAGE_REGISTRY" \