feat(qemu_static_image): add qemu_static_image option

README.md

@@ -20,7 +20,8 @@ The action also accepts some optional input parameters:
 * `dockerRunArgs`: Additional arguments to pass to `docker run`, such as volume mappings. See [`docker run` documentation](https://docs.docker.com/engine/reference/commandline/run).
 * `setup`: Shell commands to execute on the host before running the container, such as creating directories for volume mappings.
 * `install`: Shell commands to execute in the container as part of `docker build`, such as installing dependencies. This speeds up subsequent builds if `githubToken` is also used, but note that the image layer will be publicly available in your projects GitHub Package Registry, so make sure the resulting image does not have any secrets cached in logs or state.
-* `base_image`: Specify a custom base image, such as [busybox](https://hub.docker.com/_/busybox), `arch` and `distro` should be set to `none` in this case. This will allow you to chose direcly the image that will be used in the *FROM* clause of the internal docker container without needing to create a Dockerfile.arch.distro for a specific arch/distro pair. For more detials, see [PR #103](https://github.com/uraimo/run-on-arch-action/pull/103#issuecomment-1363810049). Known limitation: Only one base_image configuration for each workflow if you use GitHub images caching.
+* `base_image`: Specify a custom base image, such as [busybox](https://hub.docker.com/_/busybox), `arch` and `distro` should be set to `none` in this case. This will allow you to chose direcly the image that will be used in the *FROM* clause of the internal docker container without needing to create a Dockerfile.arch.distro for a specific arch/distro pair. For more details, see [PR #103](https://github.com/uraimo/run-on-arch-action/pull/103#issuecomment-1363810049). Known limitation: Only one base_image configuration for each workflow if you use GitHub images caching.
+* `qemu_static_image`: Specify a custom image for registering QEMU emulators. If not set, **multiarch/qemu-user-static** will be used by default.
 
 ### Basic example
 

action.yml

@@ -43,6 +43,10 @@ inputs:
     description: 'Specify a custom base image, such as \"busybox\" or your predefined base image. This will replace the \"FROM\" claus in the default Dockerfile on the fly. This is optional. Hint: with this option you are able to use all the available archs other than the ones showed by default. See the [advanced example](./.github/workflows/advanced-example.yml) in this repo. For more detials, see [PR #103](https://github.com/uraimo/run-on-arch-action/pull/103#issuecomment-1363810049).'
     required: false
     default: ''
+  qemu_static_image:
+    description: 'Specify a custom image for registering QEMU emulators. If not set, \"multiarch/qemu-user-static\" will be used by default.'
+    required: false
+    default: 'multiarch/qemu-user-static'
 
 runs:
   using: 'node16'

src/run-on-arch.js

@@ -19,6 +19,7 @@ async function main() {
   const arch = core.getInput('arch', { required: true });
   const distro = core.getInput('distro', { required: true });
   const base_image = core.getInput('base_image', { required: false });
+  const qemu_static_image = core.getInput('qemu_static_image', { required: false });
 
   if((arch==='none' || distro==='none') && !base_image){
     throw new Error(`run-on-arch: If arch and distro are not specified, base_image is required.`);
@@ -126,7 +127,7 @@ async function main() {
   console.log('Configuring Docker for multi-architecture support');
   await exec(
     path.join(__dirname, 'run-on-arch.sh'),
-    [ dockerFile, containerName, ...dockerRunArgs ],
+    [ dockerFile, containerName, qemu_static_image, ...dockerRunArgs ],
     { env },
   );
 }

src/run-on-arch.sh

@@ -5,8 +5,10 @@ set -euo pipefail
 # Args
 DOCKERFILE=$1
 CONTAINER_NAME=$2
+QEMU_STATIC_CONTAINER=$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)"
@@ -35,9 +37,7 @@ install_deps () {
   # Install support for non-x86 emulation in Docker via QEMU.
   # Platforms: linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x,
   #            linux/386, linux/arm/v7, linux/arm/v6
-  sudo apt-get update -q -y
-  sudo apt-get -qq install -y qemu qemu-user-static
-  docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
+  docker run --rm --privileged $QEMU_STATIC_CONTAINER --reset -p yes --credential yes
 }
 
 build_container () {